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

 0.1730

+    - method method of DBIx::Custom::Model is renamed to helper,

+      method is DEPRECATED!

+    - method method is renamed to helper, method is DEPRECATED!

     - insert method's id option is DEPRECATED!

     - fixed id option bug when column name is anbiguous

 0.1729

@@ -595,6 +595,16 @@ sub get_column_info {

         @$column_info];

 }

+sub helper {

+    my $self = shift;

+    

+    # Register method

+    my $methods = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+    $self->{_methods} = {%{$self->{_methods} || {}}, %$methods};

+    

+    return $self;

+}

+

 sub insert {

     my $self = shift;

@@ -646,32 +656,6 @@ sub insert {

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

 }

-sub values_clause {

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

-    

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

-    

-    # Create insert parameter tag

-    my $safety = $self->safety_character;

-    my @columns;

-    my @placeholders;

-    foreach my $column (sort keys %$param) {

-        croak qq{"$column" is not safety column name } . _subname

-          unless $column =~ /^[$safety\.]+$/;

-        my $column_quote = $self->_q($column);

-        $column_quote =~ s/\./$self->_q(".")/e;

-        push @columns, $column_quote;

-        

-        my $func = $wrap->{$column} || sub { $_[0] };

-        push @placeholders,

-          ref $param->{$column} eq 'SCALAR' ? ${$param->{$column}}

-        : $func->(":$column");

-    }

-    

-    return '(' . join(', ', @columns) . ') ' . 'values ' .

-           '(' . join(', ', @placeholders) . ')'

-}

-

 sub insert_timestamp {

     my $self = shift;

@@ -779,16 +763,6 @@ sub merge_param {

     return $merge;

 }

-sub method {

-    my $self = shift;

-    

-    # Register method

-    my $methods = ref $_[0] eq 'HASH' ? $_[0] : {@_};

-    $self->{_methods} = {%{$self->{_methods} || {}}, %$methods};

-    

-    return $self;

-}

-

 sub model {

     my ($self, $name, $model) = @_;

@@ -1192,6 +1166,32 @@ sub update_timestamp {

     return $self->{update_timestamp};

 }

+sub values_clause {

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

+    

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

+    

+    # Create insert parameter tag

+    my $safety = $self->safety_character;

+    my @columns;

+    my @placeholders;

+    foreach my $column (sort keys %$param) {

+        croak qq{"$column" is not safety column name } . _subname

+          unless $column =~ /^[$safety\.]+$/;

+        my $column_quote = $self->_q($column);

+        $column_quote =~ s/\./$self->_q(".")/e;

+        push @columns, $column_quote;

+        

+        my $func = $wrap->{$column} || sub { $_[0] };

+        push @placeholders,

+          ref $param->{$column} eq 'SCALAR' ? ${$param->{$column}}

+        : $func->(":$column");

+    }

+    

+    return '(' . join(', ', @columns) . ') ' . 'values ' .

+           '(' . join(', ', @placeholders) . ')'

+}

+

 sub where { DBIx::Custom::Where->new(dbi => shift, @_) }

 sub _create_query {

@@ -1678,6 +1678,11 @@ has default_dbi_option => sub {

     return shift->default_option;

 };

+# DEPRECATED!

+sub method {

+    warn "method is DEPRECATED! use helper instead";

+    return shift->helper(@_);

+}

 # DEPRECATED!

 sub assign_param {

@@ -2930,9 +2935,9 @@ Merge parameters.

     {key1 => [1, 1], key2 => 2}

-=head2 C<method>

+=head2 C<helper>

-    $dbi->method(

+    $dbi->helper(

         update_or_insert => sub {

             my $self = shift;

@@ -2945,7 +2950,7 @@ Merge parameters.

         }

     );

-Register method. These method is called directly from L<DBIx::Custom> object.

+Register helper. These helper is called directly from L<DBIx::Custom> object.

     $dbi->update_or_insert;

     $dbi->find_or_create;

@@ -3512,6 +3517,7 @@ L<DBIx::Custom>

     cache_method # will be removed at 2017/1/1

     # Methods

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

     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

@@ -3546,6 +3552,7 @@ L<DBIx::Custom>

 L<DBIx::Custom::Model>

     # Attribute methods

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

     filter # will be removed at 2017/1/1

     name # will be removed at 2017/1/1

     type # will be removed at 2017/1/1

@@ -75,7 +75,7 @@ sub execute {

 sub DESTROY { }

-sub method {

+sub helper {

     my $self = shift;

     # Merge

@@ -114,6 +114,13 @@ has 'filter';

 has 'name';

 has type => sub { [] };

+

+# DEPRECATED!

+sub method {

+    warn "method method is DEPRECATED! use helper instead";

+    return shift->helper(@_);

+}

+

 1;

 =head1 NAME

@@ -210,9 +217,9 @@ you don't have to specify C<table> and C<primary_key> option.

 Same as C<insert> of L<DBIx::Custom> except that

 you don't have to specify C<table> and C<primary_key> option.

-=head2 C<method>

+=head2 C<helper>

-    $model->method(

+    $model->helper(

         update_or_insert => sub {

             my $self = shift;

@@ -224,7 +231,7 @@ you don't have to specify C<table> and C<primary_key> option.

             # ...

     );

-Register method. These method is called directly from L<DBIx::Custom::Model> object.

+Register helper. These helper is called directly from L<DBIx::Custom::Model> object.

     $model->update_or_insert;

     $model->find_or_create;

@@ -1054,10 +1054,10 @@ ok($@, "execute fail");

 }

 test 'method';

-$dbi->method(

+$dbi->helper(

     one => sub { 1 }

 );

-$dbi->method(

+$dbi->helper(

     two => sub { 2 }

 );

 $dbi->method({

@@ -3267,6 +3267,17 @@ $model = $dbi->create_model(

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

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

+test 'model helper';

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

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

+$dbi->execute($create_table2);

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

+$model = $dbi->create_model(

+    table => $table2

+);

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

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

+

 test 'assign_clause';

 $dbi = DBIx::Custom->connect;

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