@@ -16,6 +16,7 @@ sub password    : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub data_source : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub dbi_options : ClassObjectAttr { initialize => {clone => 'hash', 

                                                    default => sub { {} } } }

+sub database    : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub bind_filter  : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub fetch_filter : ClassObjectAttr { initialize => {clone => 'scalar'} }

@@ -783,6 +784,8 @@ Please tell me bug if you find

     $self     = $dbi->database($database);

     $database = $dbi->database;

+This method will be used in subclass connect method.

+

 =head2 dbi_options

     # Set and get DBI option

@@ -23,6 +23,7 @@ my $dbi;

 test 'Constructor';

 $dbi = DBI::Custom->new(

     user => 'a',

+    database => 'a',

     password => 'b',

     data_source => 'c',

     dbi_options => {d => 1, e => 2},

@@ -34,7 +35,7 @@ $dbi = DBI::Custom->new(

     result_class => 'g',

     sql_template => $SQL_TMPL->{0},

 );

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

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

                 dbi_options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',

                 fetch_filter => 'g', result_class => 'g',

                 sql_template => $SQL_TMPL->{0}}, $test);

@@ -48,6 +49,7 @@ test 'Sub class constructor';

     __PACKAGE__

       ->user('a')

+      ->database('a')

       ->password('b')

       ->data_source('c')

       ->dbi_options({d => 1, e => 2})

@@ -65,6 +67,7 @@ test 'Sub class constructor';

 }

 $dbi = DBI::Custom::T1->new(

     user => 'ao',

+    database => 'ao',

     password => 'bo',

     data_source => 'co',

     dbi_options => {do => 10, eo => 20},

@@ -80,6 +83,7 @@ $dbi = DBI::Custom::T1->new(

     sql_template => $SQL_TMPL->{0},

 );

 is($dbi->user, 'ao', "$test : user");

+is($dbi->database, 'ao', "$test : database");

 is($dbi->password, 'bo', "$test : passowr");

 is($dbi->data_source, 'co', "$test : data_source");

 is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");

@@ -94,6 +98,7 @@ isa_ok($dbi, 'DBI::Custom::T1');

 test 'Sub class constructor default';

 $dbi = DBI::Custom::T1->new;

 is($dbi->user, 'a', "$test : user");

+is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : password");

 is($dbi->data_source, 'c', "$test : data_source");

 is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");

@@ -113,6 +118,7 @@ test 'Sub sub class constructor default';

 }

 $dbi = DBI::Custom::T1_2->new;

 is($dbi->user, 'a', "$test : user");

+is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : passowrd");

 is($dbi->data_source, 'c', "$test : data_source");

 is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");

@@ -132,6 +138,7 @@ test 'Customized sub class constructor default';

     __PACKAGE__

       ->user('ao')

+      ->database('ao')

       ->password('bo')

       ->data_source('co')

       ->dbi_options({do => 10, eo => 20})

@@ -149,6 +156,7 @@ test 'Customized sub class constructor default';

 }

 $dbi = DBI::Custom::T1_3->new;

 is($dbi->user, 'ao', "$test : user");

+is($dbi->database, 'ao', "$test : database");

 is($dbi->password, 'bo', "$test : password");

 is($dbi->data_source, 'co', "$test : data_source");

 is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");

@@ -164,6 +172,7 @@ isa_ok($dbi, 'DBI::Custom::T1_3');

 test 'Customized sub class constructor';

 $dbi = DBI::Custom::T1_3->new(

     user => 'a',

+    database => 'a',

     password => 'b',

     data_source => 'c',

     dbi_options => {d => 1, e => 2},

@@ -179,6 +188,7 @@ $dbi = DBI::Custom::T1_3->new(

     sql_template => $SQL_TMPL->{2},

 );

 is($dbi->user, 'a', "$test : user");

+is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : password");

 is($dbi->data_source, 'c', "$test : data_source");

 is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");