@@ -1,3 +1,5 @@

+0.1737

+    - fixed DEBUG messsage bug

 0.1736

     - micro optimization

 0.1735

@@ -1,7 +1,7 @@

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1736';

+our $VERSION = '0.1737';

 use 5.008001;

 use Carp 'croak';

@@ -19,9 +19,6 @@ use DBIx::Custom::NotExists;

 use Encode qw/encode encode_utf8 decode_utf8/;

 use Scalar::Util qw/weaken/;

-use constant DEBUG => $ENV{DBIX_CUSTOM_DEBUG} || 0;

-use constant DEBUG_ENCODING => $ENV{DBIX_CUSTOM_DEBUG_ENCODING} || 'UTF-8';

-

 has [qw/connector dsn password quote user exclude_table user_table_info

         user_column_info/],

     cache => 0,

@@ -477,17 +474,16 @@ sub execute {

       . qq{$query->{sql}\n} . _subname) if $@;

     # DEBUG message

-    if (DEBUG) {

-        print STDERR "SQL:\n" . $query->sql . "\n";

+    if ($ENV{DBIX_CUSTOM_DEBUG}) {

+        warn "SQL:\n" . $query->sql . "\n";

         my @output;

-        for my $b (@$bind) {

-            my $value = $b->{value};

+        for my $value (@$bind) {

             $value = 'undef' unless defined $value;

-            $value = encode(DEBUG_ENCODING(), $value)

+            $value = encode($ENV{DBIX_CUSTOM_DEBUG_ENCODING} || 'UTF-8', $value)

               if utf8::is_utf8($value);

             push @output, $value;

         }

-        print STDERR "Bind values: " . join(', ', @output) . "\n\n";

+        warn "Bind values: " . join(', ', @output) . "\n\n";

     }

     # Not select statement

@@ -41,6 +41,7 @@ my $binary;

 # Prepare table

 $dbi = DBIx::Custom->connect;

+

 ### SQLite only test

 test 'dbi_option default';

 $dbi = DBIx::Custom->new;

@@ -67,6 +68,18 @@ $result = $dbi->execute('select * from table1;');

 $rows   = $result->all;

 is_deeply($rows, [{key1 => 1, key2 => 4}], "basic");

+test 'DBIX_CUSTOM_DEBUG ok';

+{

+    local $ENV{DBIX_CUSTOM_DEBUG} = 1;

+    $dbi = DBIx::Custom->connect;

+    eval { $dbi->execute('drop table table1') };

+    my $error;

+    local $SIG{__WARN__} = sub {

+        $error = shift;

+    };

+    $dbi->execute('create table table1 (key1 varchar, key2 varchar, primary key(key1));');

+    ok($error);

+}

 test 'quote';

 $dbi = DBIx::Custom->connect;