@@ -1,3 +1,9 @@

+0.1728

+    - update_param is DEPRECATED, use assing_clause instead.

+    - assing_param is renamed to assing_clause, assing_param is DEPRECATED!

+    - insert_param is renamed to values_clause, insert_param is DEPRECATED!

+0.1727

+    - improved join clause parsing

 0.1726

     - improved join clause parsing

 0.1725

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1726';

+our $VERSION = '0.1728';

 use 5.008001;

 use Carp 'croak';

@@ -119,7 +119,7 @@ sub AUTOLOAD {

     }

 }

-sub assign_param {

+sub assign_clause {

     my ($self, $param, $opts) = @_;

     my $wrap = $opts->{wrap} || {};

@@ -636,14 +636,14 @@ sub insert {

     $sql .= "insert ";

     $sql .= "$prefix " if defined $prefix;

     $sql .= "into " . $self->_q($table) . " "

-      . $self->insert_param($param, {wrap => $wrap}) . " ";

+      . $self->values_clause($param, {wrap => $wrap}) . " ";

     $sql .= $append if defined $append;

     # Execute query

     return $self->execute($sql, $param, table => $table, %args);

 }

-sub insert_param {

+sub values_clause {

     my ($self, $param, $opts) = @_;

     my $wrap = $opts->{wrap} || {};

@@ -1138,7 +1138,7 @@ sub update {

     }

     # Update clause

-    my $update_clause = $self->update_param($param, {wrap => $wrap});

+    my $assign_clause = $self->assign_clause($param, {wrap => $wrap});

     # Where

     $where = $self->_create_param_from_id($id, $primary_key) if defined $id;

@@ -1167,7 +1167,7 @@ sub update {

     my $sql;

     $sql .= "update ";

     $sql .= "$prefix " if defined $prefix;

-    $sql .= $self->_q($table) . " $update_clause $where_clause ";

+    $sql .= $self->_q($table) . " set $assign_clause $where_clause ";

     $sql .= $append if defined $append;

     # Execute query

@@ -1176,16 +1176,6 @@ sub update {

 sub update_all { shift->update(allow_update_all => 1, @_) };

-sub update_param {

-    my ($self, $param, $opts) = @_;

-    

-    # Create update parameter tag

-    my $tag = $self->assign_param($param, $opts);

-    $tag = "set $tag" unless $opts->{no_set};

-

-    return $tag;

-}

-

 sub update_timestamp {

     my $self = shift;

@@ -1452,7 +1442,7 @@ sub _push_join {

             my @j_clauses = reverse split /\s(and|on)\s/, $j_clause;

             my $c = $self->safety_character;

-            my $join_re = qr/(?:^|\s)($c+)\.$c+[^$c]+($c+)\.$c+/;

+            my $join_re = qr/($c+)\.$c+[^$c].*?($c+)\.$c+/sm;

             for my $clause (@j_clauses) {

                 if ($clause =~ $join_re) {

                     $table1 = $1;

@@ -1663,6 +1653,32 @@ sub _apply_filter {

     return $self;

 }

+# DEPRECATED!

+has 'data_source';

+has dbi_options => sub { {} };

+has filter_check  => 1;

+has 'reserved_word_quote';

+

+# DEPRECATED!

+sub assign_param {

+    my $self = shift;

+    warn "assing_param is DEPRECATED! use assign_clause instead";

+    return $self->assign_clause(@_);

+}

+

+# DEPRECATED

+sub update_param {

+    my ($self, $param, $opts) = @_;

+    

+    warn "update_param is DEPRECATED! use assing_clause instead.";

+    

+    # Create update parameter tag

+    my $tag = $self->assign_clause($param, $opts);

+    $tag = "set $tag" unless $opts->{no_set};

+

+    return $tag;

+}

+

 # DEPRECATED!

 sub create_query {

     warn "create_query is DEPRECATED! use query option of each method";

@@ -1813,12 +1829,6 @@ sub register_tag_processor {

     return $self;

 }

-# DEPRECATED!

-has 'data_source';

-has dbi_options => sub { {} };

-has filter_check  => 1;

-has 'reserved_word_quote';

-

 # DEPRECATED!

 sub default_bind_filter {

     my $self = shift;

@@ -1868,6 +1878,13 @@ sub default_fetch_filter {

     return $self->{default_in_filter};

 }

+# DEPRECATED!

+sub insert_param {

+    my $self = shift;

+    warn "insert_param is DEPRECATED! use values_clause instead";

+    return $self->values_clause(@_);

+}

+

 # DEPRECATED!

 sub insert_param_tag {

     warn "insert_param_tag is DEPRECATED! " .

@@ -2253,15 +2270,17 @@ in C<type rule>'s C<from1> and C<from2> section.

 Get available type names. You can use these type names in

 C<type_rule>'s C<into1> and C<into2> section.

-=head2 C<assign_param>

+=head2 C<assign_clause>

-    my $assign_param = $dbi->assign_param({title => 'a', age => 2});

+    my $assign_clause = $dbi->assign_clause({title => 'a', age => 2});

-Create assign parameter.

+Create assign clause

     title = :title, author = :author

-This is equal to C<update_param> exept that set is not added.

+This is used to create update clause.

+

+    "update book set " . $dbi->assign_clause({title => 'a', age => 2});

 =head2 C<column>

@@ -2812,11 +2831,11 @@ is executed, the following SQL is executed.

 =over 4

-=head2 C<insert_param>

+=head2 C<values_clause>

-    my $insert_param = $dbi->insert_param({title => 'a', age => 2});

+    my $values_clause = $dbi->values_clause({title => 'a', age => 2});

-Create insert parameters.

+Create values clause.

     (title, author) values (title = :title, age = :age);

@@ -3477,6 +3496,9 @@ L<DBIx::Custom>

     cache_method # will be removed at 2017/1/1

     # Methods

+    assign_param # will be removed at 2017/1/1

+    update_param # will be removed at 2017/1/1

+    insert_param # will be removed at 2017/1/1

     create_query # will be removed at 2017/1/1

     apply_filter # will be removed at 2017/1/1

     select_at # will be removed at 2017/1/1

@@ -3561,8 +3583,6 @@ I extend one year each time he tell me it.

 EXPERIMENTAL functionality will be changed without warnings.

-This policy was changed at 2011/6/28

-

 =head1 BUGS

 Please tell me bugs if found.

@@ -13,7 +13,7 @@ plan skip_all => $ENV{DBIX_CUSTOM_SKIP_MESSAGE} || 'common.t is always skipped'

 plan 'no_plan';

-$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+#$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

 sub test { print "# $_[0]\n" }

 # Constant

@@ -78,6 +78,8 @@ my $join;

 my $binary;

 my $user_table_info;

 my $user_column_info;

+my $values_clause;

+my $assign_clause;

 require MyDBI1;

 {

@@ -2004,14 +2006,14 @@ $result = $model->select(

 is_deeply($result->one,

           {$key1 => 1, $key2 => 2, "${table2}__$key1" => 1, "${table2}__$key3" => 3});

-test 'insert_param';

+test 'values_clause';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

 $param = {$key1 => 1, $key2 => 2};

-$insert_param = $dbi->insert_param($param);

+$values_clause = $dbi->values_clause($param);

 $sql = <<"EOS";

-insert into $table1 $insert_param

+insert into $table1 $values_clause

 EOS

 $dbi->execute($sql, param => $param, table => $table1);

 is($dbi->select(table => $table1)->one->{$key1}, 1);

@@ -2021,15 +2023,15 @@ $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

 $param = {$key1 => 1, $key2 => 2};

-$insert_param = $dbi->insert_param($param);

+$values_clause = $dbi->insert_param($param);

 $sql = <<"EOS";

-insert into $table1 $insert_param

+insert into $table1 $values_clause

 EOS

 $dbi->execute($sql, param => $param, table => $table1);

 is($dbi->select(table => $table1)->one->{$key1}, 1);

 is($dbi->select(table => $table1)->one->{$key2}, 2);

-eval { $dbi->insert_param({";" => 1}) };

+eval { $dbi->values_clause({";" => 1}) };

 like($@, qr/not safety/);

 test 'mycolumn';

@@ -3208,7 +3210,7 @@ $model = $dbi->create_model(

 $model->method(foo => sub { shift->select(@_) });

 is_deeply($model->foo->one, {$key1 => 1, $key3 => 3});

-test 'update_param';

+test 'assign_clause';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

@@ -3216,9 +3218,9 @@ $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $ke

 $dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

 $param = {$key2 => 11};

-$update_param = $dbi->update_param($param);

+$assign_clause = $dbi->assign_clause($param);

 $sql = <<"EOS";

-update $table1 $update_param

+update $table1 set $assign_clause

 where $key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

@@ -3236,9 +3238,9 @@ $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $ke

 $dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

 $param = {$key2 => 11, $key3 => 33};

-$update_param = $dbi->update_param($param);

+$assign_clause = $dbi->assign_clause($param);

 $sql = <<"EOS";

-update $table1 $update_param

+update $table1 set $assign_clause

 where $key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

@@ -3255,9 +3257,9 @@ $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $ke

 $dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

 $param = {$key2 => 11, $key3 => 33};

-$update_param = $dbi->update_param($param, {no_set => 1});

+$assign_clause = $dbi->update_param($param, {no_set => 1});

 $sql = <<"EOS";

-update $table1 set $update_param

+update $table1 set $assign_clause

 where $key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

@@ -3268,11 +3270,9 @@ is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 33, $key4 => 4, $key5 => 5}

                   "update param no_set");

-eval { $dbi->update_param({";" => 1}) };

+eval { $dbi->assign_clause({";" => 1}) };

 like($@, qr/not safety/);

-

-test 'update_param';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

@@ -3280,9 +3280,22 @@ $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $ke

 $dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

 $param = {$key2 => 11};

-$update_param = $dbi->assign_param($param);

+$assign_clause = $dbi->assign_param($param);

+$sql = <<"EOS";

+update $table1 set $assign_clause

+where $key1 = 1

+EOS

+$dbi->execute($sql, param => $param, table => $table1);

+$result = $dbi->execute("select * from $table1 order by $key1");

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 3, $key4 => 4, $key5 => 5},

+                  {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

+                  "basic");

+

+$param = {$key2 => 11};

+$assign_clause = $dbi->assign_clause($param);

 $sql = <<"EOS";

-update $table1 set $update_param

+update $table1 set $assign_clause

 where $key1 = 1

 EOS

 $dbi->execute($sql, param => $param, table => $table1);

@@ -282,7 +282,24 @@ $result = $dbi->select(

     table => 'table1',

     column => [{table2 => ['key3']}],

     join => [

-        "left outer join table2 on coalesce(table2.key3, 0) > '3' and table1.key1 = table2.key1"

+        "left outer join table2 on coalesce(table1.key1, 0) = coalesce(table2.key1, 0) and table2.key3 > '3'"

     ]

 );

-is_deeply($result->all, [{"table2.key3" => 4}]);

+is_deeply($result->all, [{"table2.key3" => 4}]);

+

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

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

+eval { $dbi->execute("drop table table2") };

+$dbi->execute($create_table1);

+$dbi->execute("create table table2 (key1, key3)");

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

+$dbi->insert(table => 'table2', param => {key1 => 1, key3 => 4});

+$dbi->insert(table => 'table2', param => {key1 => 1, key3 => 1});

+$result = $dbi->select(

+    table => 'table1',

+    column => [{table2 => ['key3']}],

+    join => [

+        "left outer join table2 on table2.key3 > '3' and coalesce(table1.key1, 0) = coalesce(table2.key1, 0)"

+    ]

+);

+is_deeply($result->all, [{"table2.key3" => 4}]);