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

 0.1622

   deprecated DBIx::Custom::SQLite and DBIx::Custom::MySQL

-  

+  added dbi_options attribute

+  checked attributes passed to connect method

 0.1621

   cleanup (removed undocumented features)

 0.1620

@@ -84,19 +84,6 @@ sub helper {

     return $self;

 }

-#sub new {

-#    my $self = shift->SUPER::new(@_);

-#    

-#    # Check attribute names

-#    my @attrs = keys %$self;

-#    foreach my $attr (@attrs) {

-#        croak qq{"$attr" is invalid attribute name"}

-#          unless $self->can($attr);

-#    }

-#    

-#    return $self;

-#}

-

 sub connect {

     my $proto = shift;

@@ -111,6 +98,9 @@ sub connect {

     my $user        = $self->user;

     my $password    = $self->password;

+    my $dbi_options = $self->dbi_options || {};

+    

+    $DB::single = 1;

     # Connect

     my $dbh = eval {DBI->connect(

@@ -121,6 +111,7 @@ sub connect {

             RaiseError => 1,

             PrintError => 0,

             AutoCommit => 1,

+            %$dbi_options

         }

     )};

@@ -317,6 +308,19 @@ sub insert {

     return $ret_val;

 }

+sub new {

+    my $self = shift->SUPER::new(@_);

+    

+    # Check attribute names

+    my @attrs = keys %$self;

+    foreach my $attr (@attrs) {

+        croak qq{"$attr" is invalid attribute name}

+          unless $self->can($attr);

+    }

+    

+    return $self;

+}

+

 sub register_filter {

     my $invocant = shift;

@@ -735,6 +739,14 @@ C<connect()> method use this value to connect the database.

 L<DBI> object. You can call all methods of L<DBI>.

+=head2 C<dbi_options>

+

+    my $dbi_options = $dbi->dbi_options;

+    $dbi            = $dbi->dbi_options($dbi_options);

+

+DBI options.

+C<connect()> method use this value to connect the database.

+

 =head2 C<default_bind_filter>

     my $default_bind_filter = $dbi->default_bind_filter

@@ -960,6 +972,13 @@ B<Example:>

                  append => "some statement",

                  filter => {title => 'encode_utf8'})

+=head2 C<new>

+

+    my $dbi = DBIx::Custom->connect(data_source => "dbi:mysql:database=dbname",

+                                    user => 'ken', password => '!LFKD%$&');

+

+Create a new L<DBIx::Custom> object.

+

 =head2 C<register_filter>

     $dbi->register_filter(%filters);

@@ -1,36 +1,50 @@

-use Test::More;

-use strict;

-use warnings;

-

-# user password database

-our ($USER, $PASSWORD, $DATABASE) = connect_info();

-

-plan skip_all => 'private MySQL test' unless $USER;

-

-plan 'no_plan';

-

-use DBIx::Custom;

-use Scalar::Util 'blessed';

-{

-    my $dbi = DBIx::Custom->connect(

-        user => $USER,

-        password => $PASSWORD,

-        data_source => "dbi:mysql:dbname=$DATABASE"

-    );

-    $dbi->connect;

-    

-    ok(blessed $dbi->dbh);

-    can_ok($dbi->dbh, qw/prepare/);

-}

-

-sub connect_info {

-    my $file = 'password.tmp';

-    open my $fh, '<', $file

-      or return;

-    

-    my ($user, $password, $database) = split(/\s/, (<$fh>)[0]);

-    

-    close $fh;

-    

-    return ($user, $password, $database);

-}

+use Test::More;

+use strict;

+use warnings;

+

+# user password database

+our ($USER, $PASSWORD, $DATABASE) = connect_info();

+

+plan skip_all => 'private MySQL test' unless $USER;

+

+plan 'no_plan';

+

+use DBIx::Custom;

+use Scalar::Util 'blessed';

+{

+    my $dbi = DBIx::Custom->connect(

+        user => $USER,

+        password => $PASSWORD,

+        data_source => "dbi:mysql:dbname=$DATABASE"

+    );

+    $dbi->connect;

+    

+    ok(blessed $dbi->dbh);

+    can_ok($dbi->dbh, qw/prepare/);

+    ok($dbi->dbh->{AutoCommit});

+    ok(!$dbi->dbh->{mysql_enable_utf8});

+}

+

+{

+    my $dbi = DBIx::Custom->connect(

+        user => $USER,

+        password => $PASSWORD,

+        data_source => "dbi:mysql:dbname=$DATABASE",

+        dbi_options => {AutoCommit => 0, mysql_enable_utf8 => 1}

+    );

+    $dbi->connect;

+    ok(!$dbi->dbh->{AutoCommit});

+    ok($dbi->dbh->{mysql_enable_utf8});

+}

+

+sub connect_info {

+    my $file = 'password.tmp';

+    open my $fh, '<', $file

+      or return;

+    

+    my ($user, $password, $database) = split(/\s/, (<$fh>)[0]);

+    

+    close $fh;

+    

+    return ($user, $password, $database);

+}

@@ -1,4 +1,4 @@

-use Test::More tests => 11;

+use Test::More tests => 12;

 use strict;

 use warnings;

@@ -19,7 +19,6 @@ test 'Constructor';

 $query_builder = DBIx::Custom::QueryBuilder->new;

 $dbi = DBIx::Custom->new(

     user => 'a',

-    database => 'a',

     password => 'b',

     data_source => 'c',

     filters => {

@@ -30,7 +29,7 @@ $dbi = DBIx::Custom->new(

     result_class => 'g',

     query_builder => $query_builder,

 );

-is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c', 

+is_deeply($dbi,{user => 'a', password => 'b', data_source => 'c', 

                 filters => {f => 3}, default_bind_filter => 'f',

                 default_fetch_filter => 'g', result_class => 'g',

                 query_builder => $query_builder}, $test);

@@ -101,3 +100,6 @@ test 'expand';

               {'books.title' => 'Perl', 'books.author' => 'Ken'});

 }

+test 'invalid attribute name';

+eval {$dbi = DBIx::Custom->new(a => 1) };

+like ($@, qr/"a" is invalid attribute name/, $test);