--- PApp-SQL/SQL.xs	2001/08/11 02:46:16	1.8
+++ PApp-SQL/SQL.xs	2002/04/11 01:02:10	1.12
@@ -8,7 +8,7 @@
 # define call_sv     perl_call_sv
 #endif
 
-#if (PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION <= 5))
+#if (PERL_VERSION > 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION >= 6))
 # define CAN_UTF8 1
 #endif
 
@@ -227,7 +227,7 @@
             SV *sth;
             SV *sql;
             SV *execute;
-            STRLEN dc;
+            STRLEN dc, dd; /* dummy */
 
             /* save our arguments against destruction through function calls */
             SP += items;
@@ -235,13 +235,15 @@
             /* first check wether we should use an explicit db handle */
             if (!is_dbh (dbh))
               {
-                dbh = get_sv ("DBH", FALSE);
+                /* the next line doesn't work - check why later maybe */
+                /* dbh = get_sv ("DBH", FALSE);
                 if (!is_dbh (dbh))
-                  {
+                  {*/
                     dbh = GvSV(DBH);
                     if (!is_dbh (dbh))
-                      croak ("sql_exec: no $DBH found in current package or in PApp::SQL::");
-                  }
+                      croak ("sql_exec: no $DBH argument and no fallback in $PApp::SQL::DBH");
+                      /*croak ("sql_exec: no $DBH found in current package or in PApp::SQL::");
+                  }*/
               }
             else
               arg++; /* we consumed one argument */
@@ -286,7 +288,7 @@
                 if (count != 1)
                   croak ("sql_exec: unable to prepare() statement '%s': %s",
                          SvPV (sql, dc),
-                         SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                         SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
                 sth = POPs;
 
@@ -313,14 +315,14 @@
             if (count != 1)
               croak ("sql_exec: execute() didn't return any value ('%s'): %s",
                      SvPV (sql, dc),
-                     SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                     SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
             execute = POPs;
 
             if (!SvTRUE (execute))
               croak ("sql_exec: unable to execute statement '%s' (%s)",
                      SvPV (sql, dc),
-                     SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                     SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
             sv_setsv (GvSV(sql_exec), execute);
 
@@ -341,12 +343,12 @@
                 if (count != 1)
                   croak ("sql_exec: bind_columns() didn't return any value ('%s'): %s",
                          SvPV (sql, dc),
-                         SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                         SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
                 if (!SvOK (POPs))
                   croak ("sql_exec: bind_columns() didn't return a true ('%s'): %s",
                          SvPV (sql, dc),
-                         SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                         SvPV (get_sv ("DBI::errstr", TRUE), dd));
               }
 
             /* free our arguments from the stack */