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

+0.1683

+    - data_source is DEPRECATED! It is renamed to dsn

 0.1682

     - improved debug message

     - fixed merge_param bug

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

 package DBIx::Custom;

-our $VERSION = '0.1682';

+our $VERSION = '0.1683';

 use 5.008001;

 use strict;

@@ -25,7 +25,7 @@ use constant DEBUG_ENCODING => $ENV{DBIX_CUSTOM_DEBUG_ENCODING} || 'UTF-8';

 our @COMMON_ARGS = qw/table query filter type/;

 __PACKAGE__->attr(

-    [qw/connector data_source password pid user/],

+    [qw/connector dsn password user/],

     cache => 0,

     cache_method => sub {

         sub {

@@ -192,9 +192,6 @@ sub connect {

     # Connect

     $self->dbh;

-    # Set process ID

-    $self->pid($$);

-    

     return $self;

 }

@@ -1209,16 +1206,16 @@ sub _connect {

     my $self = shift;

     # Attributes

-    my $data_source = $self->data_source;

-    croak qq{"data_source" must be specified } . _subname

-      unless $data_source;

+    my $dsn = $self->data_source || $self->dsn;

+    croak qq{"dsn" must be specified } . _subname

+      unless $dsn;

     my $user        = $self->user;

     my $password    = $self->password;

     my $dbi_option = {%{$self->dbi_options}, %{$self->dbi_option}};

     # Connect

     my $dbh = eval {DBI->connect(

-        $data_source,

+        $dsn,

         $user,

         $password,

         {

@@ -1375,6 +1372,9 @@ sub _where_to_obj {

     return $obj;

 }

+# DEPRECATED!

+__PACKAGE__->attr('data_source');

+

 # DEPRECATED!

 __PACKAGE__->attr(

     dbi_options => sub { {} },

@@ -1492,7 +1492,7 @@ DBIx::Custom - Useful database access, respecting SQL!

     # Connect

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

-        data_source => "dbi:mysql:database=dbname",

+        dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_option => {mysql_enable_utf8 => 1}

@@ -1619,12 +1619,14 @@ C<default_dbi_option> to L<DBIx::Connector>.

     my $dbi = DBIx::Custom->new(connector => $connector);

-=head2 C<data_source>

+=head2 C<dsn>

+

+    my $dsn = $dbi->dsn;

+    $dbi    = $dbi->dsn("DBI:mysql:database=dbname");

-    my $data_source = $dbi->data_source;

-    $dbi            = $dbi->data_source("DBI:mysql:database=dbname");

+Data source name, used when C<connect()> is executed.

-Data source, used when C<connect()> is executed.

+C<data_source> is DEPRECATED! It is renamed to C<dsn>.

 =head2 C<dbi_option>

@@ -1769,7 +1771,7 @@ This is equal to C<update_param_tag> exept that set is not added.

 =head2 C<connect>

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

-        data_source => "dbi:mysql:database=dbname",

+        dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_option => {mysql_enable_utf8 => 1}

@@ -2297,7 +2299,7 @@ Create column clause for myself. The follwoing column clause is created.

 =head2 C<new>

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

-        data_source => "dbi:mysql:database=dbname",

+        dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_option => {mysql_enable_utf8 => 1}

@@ -162,13 +162,13 @@ use C<connect()> to connect to database.

 Return value is L<DBIx::Custom> object.

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

-        data_source => "dbi:mysql:database=bookstore",

+        dsn => "dbi:mysql:database=bookstore",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_options => {mysql_enable_utf8 => 1}

     );

-C<data_source> must be one corresponding to the database system.

+C<dsn> must be one corresponding to the database system.

 The following ones are data source example.

 B<MySQL>

@@ -1018,7 +1018,7 @@ You can pass L<DBIx::Custom::Where> object to C<where> of C<select()>.

     $where->param({title => 'Perl'});

     my $result = $dbi->select(table => 'book', where => $where);

-You can also pass it to C<where> of C<update()>�AC<delete()>

+You can also pass it to C<where> of C<update()>AC<delete()>

 =head3 With C<execute()>

@@ -1093,7 +1093,7 @@ without C<table> option.

 Model is L<DBIx::Custom::Model>.

-If you need table name�Ayou can get it by C<table()>.

+If you need table nameAyou can get it by C<table()>.

     my $table = $model->table;

@@ -1186,7 +1186,7 @@ Valude of C<table> and C<columns> is used.

     my $column_clause = $model->mycolumn;

-If C<table> is 'book'�AC<column> is ['id', 'name'],

+If C<table> is 'book'AC<column> is ['id', 'name'],

 the following clause is created.

     book.id as id, book.name as name

@@ -1197,7 +1197,7 @@ You can create column clause from columns of other table.

     my $column_clause = $model->column('company');

-If C<table> is 'company'�AC<column> is ['id', 'name'],

+If C<table> is 'company'AC<column> is ['id', 'name'],

 the following clause is created.

     company.id as company__id, company.name as company__name

@@ -1209,7 +1209,7 @@ Valude of C<table> and C<columns> is used.

     my $column_clause = $model->column_clause;

-If C<table> is 'book'�AC<column> is ['id', 'name'],

+If C<table> is 'book'AC<column> is ['id', 'name'],

 the following clause is created.

     book.id as id, book.name as name

@@ -170,13 +170,13 @@ L<DBIx::Custom>を読み込みます。

 戻り値はL<DBIx::Custom>オブジェクトです。

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

-        data_source => "dbi:mysql:database=bookstore",

+        dsn => "dbi:mysql:database=bookstore",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_options => {mysql_enable_utf8 => 1}

     );

-C<data_source>はデータベースシステムに応じたものである必要があります。

+C<dsn>はデータベースシステムに応じたものである必要があります。

 以下はデータソースのサンプルです。

 B<MySQL>

@@ -15,7 +15,7 @@ use Scalar::Util 'blessed';

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

         user => $USER,

         password => $PASSWORD,

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

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

     );

     $dbi->connect;

@@ -29,7 +29,7 @@ use Scalar::Util 'blessed';

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

         user => $USER,

         password => $PASSWORD,

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

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

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

     );

     $dbi->connect;

@@ -42,7 +42,7 @@ my $DROP_TABLE = {

 };

 my $NEW_ARGS = {

-    0 => {data_source => 'dbi:SQLite:dbname=:memory:'}

+    0 => {dsn => 'dbi:SQLite:dbname=:memory:'}

 };

 # Variables

@@ -205,7 +205,7 @@ is_deeply($rows, [{key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5},

                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "basic");

 test 'Error case';

-eval {DBIx::Custom->connect(data_source => 'dbi:SQLit')};

+eval {DBIx::Custom->connect(dsn => 'dbi:SQLit')};

 ok($@, "connect error");

 $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

@@ -1371,10 +1371,10 @@ $result->default_filter('one');

 is($result->default_filter->(), 1);

 test 'dbi_option';

-$dbi = DBIx::Custom->connect(data_source => 'dbi:SQLite:dbname=:memory:',

+$dbi = DBIx::Custom->connect(dsn => 'dbi:SQLite:dbname=:memory:',

                              dbi_option => {PrintError => 1});

 ok($dbi->dbh->{PrintError});

-$dbi = DBIx::Custom->connect(data_source => 'dbi:SQLite:dbname=:memory:',

+$dbi = DBIx::Custom->connect(dsn => 'dbi:SQLite:dbname=:memory:',

                              dbi_options => {PrintError => 1});

 ok($dbi->dbh->{PrintError});

@@ -1991,6 +1991,26 @@ is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}],

     }

 }

+$dbi = DBIx::Custom->connect($NEW_ARGS->{0});

+$dbi->execute($CREATE_TABLE->{0});

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2});

+$sql = <<"EOS";

+left outer join (

+  select * from table1 as t1

+  where t1.key2 = (

+    select max(t2.key2) from table1 as t2

+    where t1.key1 = t2.key1

+  )

+) as latest_table1 on table1.key1 = latest_table1.key1

+EOS

+$join = [$sql];

+$rows = $dbi->select(

+    table => 'table1',

+    column => 'latest_table1.key1 as latest_table1__key1',

+    join  => $join

+)->fetch_hash_all;

+is_deeply($rows, [{latest_table1__key1 => 1}]);

+

 test 'mycolumn';

 $dbi = MyDBI8->connect($NEW_ARGS->{0});

 $dbi->execute($CREATE_TABLE->{0});

@@ -18,7 +18,7 @@ $query_builder = DBIx::Custom::QueryBuilder->new;

 $dbi = DBIx::Custom->new(

     user => 'a',

     password => 'b',

-    data_source => 'c',

+    dsn => 'c',

     filters => {

         f => 3,

     },

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

     result_class => 'g',

     query_builder => $query_builder,

 );

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

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

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

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

                 query_builder => $query_builder});

@@ -51,15 +51,15 @@ my $result;

         my $self = ref $proto ? $proto : $proto->new(@_);

         # Data source

-        if (!$self->data_source) {

+        if (!$self->dsn) {

             my $database = $self->database;

             my $host     = $self->host;

             my $port     = $self->port;

-            my $data_source = "dbi:mysql:";

-            $data_source .= "database=$database;" if $database;

-            $data_source .= "host=$host;"         if $host;

-            $data_source .= "port=$port;"         if $port;

-            $self->data_source($data_source);

+            my $dsn = "dbi:mysql:";

+            $dsn .= "database=$database;" if $database;

+            $dsn .= "host=$host;"         if $host;

+            $dsn .= "port=$port;"         if $port;

+            $self->dsn($dsn);

         }

         return $self->SUPER::connect;

@@ -72,7 +72,7 @@ test 'connect';

 $dbi = DBIx::Custom::MySQL->new(user => $USER, password => $PASSWORD,

                     database => $DATABASE, host => 'localhost', port => '10000');

 $dbi->connect;

-like($dbi->data_source, qr/dbi:mysql:database=.*;host=localhost;port=10000;/, "created data source");

+like($dbi->dsn, qr/dbi:mysql:database=.*;host=localhost;port=10000;/, "created data source");

 is(ref $dbi->dbh, 'DBI::db');

 test 'attributes';

@@ -84,7 +84,7 @@ is($dbi->port, 'b', "port");

 test 'limit';

 $dbi = DBIx::Custom->connect(

-    data_source => "dbi:mysql:database=$DATABASE",

+    dsn => "dbi:mysql:database=$DATABASE",

     user => $USER,

     password => $PASSWORD

 );