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

+0.1694

+    - DBIx::Custom::Model type attribute is DEPRECATED!

+      this is renamed to bind_type.

 0.1693

     - separate DBIx::Custom type_rule from filter

     - DBIx::Custom::Model filter attrribute is DEPRECATED!

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

 package DBIx::Custom;

-our $VERSION = '0.1693';

+our $VERSION = '0.1694';

 use 5.008001;

 use Object::Simple -base;

@@ -19,7 +19,8 @@ use Encode qw/encode encode_utf8 decode_utf8/;

 use constant DEBUG => $ENV{DBIX_CUSTOM_DEBUG} || 0;

 use constant DEBUG_ENCODING => $ENV{DBIX_CUSTOM_DEBUG_ENCODING} || 'UTF-8';

-our @COMMON_ARGS = qw/table query filter type id primary_key type_rule_off/;

+our @COMMON_ARGS = qw/bind_type table query filter id primary_key

+                      type_rule_off type/;

 has [qw/connector dsn password user/],

     cache => 0,

@@ -359,8 +360,8 @@ sub execute {

     $tables = [$tables] unless ref $tables eq 'ARRAY';

     my $filter = delete $args{filter};

     $filter = _array_to_hash($filter);

-    my $type = delete $args{type};

-    $type = _array_to_hash($type);

+    my $bind_type = delete $args{bind_type} || delete $args{type};

+    $bind_type = _array_to_hash($bind_type);

     my $type_rule_off = delete $args{type_rule_off};

     my $query_return = delete $args{query};

@@ -434,7 +435,7 @@ sub execute {

         $query->columns,

         $filter,

         $type_filter,

-        $type

+        $bind_type

     );

     # Execute

@@ -442,8 +443,12 @@ sub execute {

     my $affected;

     eval {

         for (my $i = 0; $i < @$bind; $i++) {

-            my $type = $bind->[$i]->{type};

-            $sth->bind_param($i + 1, $bind->[$i]->{value}, $type ? $type : ());

+            my $bind_type = $bind->[$i]->{bind_type};

+            $sth->bind_param(

+                $i + 1,

+                $bind->[$i]->{value},

+                $bind_type ? $bind_type : ()

+            );

         }

         $affected = $sth->execute;

     };

@@ -1173,7 +1178,7 @@ sub _apply_filter {

 }

 sub _create_bind_values {

-    my ($self, $params, $columns, $filter, $type_filter, $type) = @_;

+    my ($self, $params, $columns, $filter, $type_filter, $bind_type) = @_;

     # Create bind values

     my $bind = [];

@@ -1210,7 +1215,7 @@ sub _create_bind_values {

         $value = $tf->($value) if $tf;

         # Bind values

-        push @$bind, {value => $value, type => $type->{$column}};

+        push @$bind, {value => $value, bind_type => $bind_type->{$column}};

         # Count up 

         $count->{$column}++;

@@ -1409,7 +1414,7 @@ sub _where_to_obj {

     # Check where argument

     croak qq{"where" must be hash reference or DBIx::Custom::Where object}

-        . qq{or array reference, which contains where clause and paramter}

+        . qq{or array reference, which contains where clause and parameter}

         . _subname

       unless ref $obj eq 'DBIx::Custom::Where';

@@ -1862,7 +1867,9 @@ Query builder, default to L<DBIx::Custom::QueryBuilder> object.

      my reserved_word_quote = $dbi->reserved_word_quote;

      $dbi                   = $dbi->reserved_word_quote('"');

-Reserved word quote, default to empty string.

+Reserved word quote.

+Default to double quote '"' except for mysql.

+In mysql, default to back quote '`'

 =head2 C<result_class>

@@ -2081,7 +2088,7 @@ Specify database data type.

     type => [image => DBI::SQL_BLOB]

     type => [[qw/image audio/] => DBI::SQL_BLOB]

-This is used to bind paramter by C<bind_param()> of statment handle.

+This is used to bind parameter by C<bind_param()> of statment handle.

     $sth->bind_param($pos, $value, DBI::SQL_BLOB);

@@ -2305,7 +2312,7 @@ See L<DBIx::Custom::Model> to know model features.

     my $param = $dbi->merge_param({key1 => 1}, {key1 => 1, key2 => 2});

-Merge paramters.

+Merge parameters.

 $param:

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

 package DBIx::Custom::Model;

-

 use Object::Simple -base;

 use Carp 'croak';

@@ -9,9 +8,9 @@ use DBIx::Custom::Util '_subname';

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 has [qw/dbi table/],

+    bind_type => sub { [] },

     columns => sub { [] },

     join => sub { [] },

-    type => sub { [] },

     primary_key => sub { [] };

 our $AUTOLOAD;

@@ -48,8 +47,9 @@ foreach my $method (@methods) {

         my @args = (

             table => $self->table,

-            type => $self->type,

-            primary_key => $self->primary_key

+            bind_type => $self->bind_type,

+            primary_key => $self->primary_key,

+            type => $self->type, # DEPRECATED!

         );

         push @args, (join => $self->join) if $method =~ /^select/;

         unshift @args, shift if @_ % 2;

@@ -101,6 +101,7 @@ sub new {

 # DEPRECATED!

 has filter => sub { [] };

 has 'name';

+has type => sub { [] };

 1;

@@ -119,43 +120,42 @@ my $table = DBIx::Custom::Model->new(table => 'books');

 =head2 C<dbi>

     my $dbi = $model->dbi;

-    $model  = $model->dbi($dbi);

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

 L<DBIx::Custom> object.

 =head2 C<join>

     my $join = $model->join;

-    $model   = $model->join(

+    $model = $model->join(

         ['left outer join company on book.company_id = company.id']

     );

-Join clause, this is used as C<select()>'s C<join> option.

+Join clause, this value is passed to C<select> method.

 =head2 C<primary_key>

     my $primary_key = $model->primary_key;

-    $model          = $model->primary_key(['id', 'number']);

+    $model = $model->primary_key(['id', 'number']);

-Foreign key, this is used as C<primary_key> of C<insert_at>,C<update_at()>,

-C<delete_at()>,C<select_at()>.

+Primary key,this is passed to C<insert>, C<update>,

+C<delete>, and C<select> method.

 =head2 C<table>

     my $table = $model->table;

-    $model    = $model->table('book');

+    $model = $model->table('book');

-Table name, this is used as C<select()> C<table> option.

-Generally, this is automatically set from class name.

+Table name, this is passed to C<select> method.

-=head2 C<type>

+=head2 C<bind_type>

-    my $type = $model->type;

-    $model   = $model->type(['image' => DBI::SQL_BLOB]);

+    my $type = $model->bind_type;

+    $model = $model->bind_type(['image' => DBI::SQL_BLOB]);

-Database data type, this is used as type optioon of C<insert()>, C<insert_at()>,

-C<update()>, C<update_at()>, C<update_all>, C<delete()>, C<delete_all()>,

-C<select()>, C<select_at()>

+Database data type, this is used as type optioon of C<insert>, 

+C<update>, C<update_all>, C<delete>, C<delete_all>,

+C<select>, and C<execute> method

 =head1 METHODS

@@ -167,21 +167,21 @@ and implements the following new ones.

     $table->delete(...);

-Same as C<delete()> of L<DBIx::Custom> except that

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

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

 =head2 C<delete_all>

     $table->delete_all(...);

-Same as C<delete_all()> of L<DBIx::Custom> except that

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

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

 =head2 C<insert>

     $table->insert(...);

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

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

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

 =head2 C<method>

@@ -227,21 +227,21 @@ Create a L<DBIx::Custom::Table> object.

     $table->select(...);

-Same as C<select()> of L<DBIx::Custom> except that

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

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

 =head2 C<update>

     $table->update(...);

-Same as C<update()> of L<DBIx::Custom> except that

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

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

 =head2 C<update_all>

     $table->update_all(param => \%param);

-Same as C<update_all()> of L<DBIx::Custom> except that

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

 you don't have to specify table name.

 =cut

@@ -1,13 +1,11 @@

 package DBIx::Custom::Where;

-

 use Object::Simple -base;

+use Carp 'croak';

+use DBIx::Custom::Util '_subname';

 use overload 'bool' => sub {1}, fallback => 1;

 use overload '""' => sub { shift->to_string }, fallback => 1;

-use DBIx::Custom::Util '_subname';

-use Carp 'croak';

-

 # Carp trust relationship

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

@@ -102,12 +100,14 @@ sub _parse {

             croak qq{Each part contains one column name: "$clause" (}

                   . _subname . ")";

         }

-

+        

+        # Remove quote

         my $column = $columns->[0];

         if (my $q = $self->reserved_word_quote) {

             $column =~ s/$q//g;

         }

+        # Check safety

         my $safety = $self->safety_character;

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

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

@@ -151,38 +151,51 @@ DBIx::Custom::Where - Where clause

 =head1 SYNOPSYS

     my $where = DBIx::Custom::Where->new;

+    my $string_where = "$where";

 =head1 ATTRIBUTES

 =head2 C<clause>

-    $where->clause(

-        ['and', '{= title}', ['or', '{< date}', '{> date}']]

+    my $clause = $where->clause;

+    $where = $where->clause(

+        ['and',

+            'title = :title', 

+            ['or', 'date < :date', 'date > :date']

+        ]

     );

 Where clause. Above one is expanded to the following SQL by to_string

 If all parameter names is exists.

-    "where ( {= title} and ( {< date} or {> date} ) )"

+    "where ( title = :title and ( date < :date or date > :date ) )"

 =head2 C<param>

     my $param = $where->param;

-    $where    = $where->param({title => 'Perl',

-                               date => ['2010-11-11', '2011-03-05']},

-                               name => ['Ken', 'Taro']);

+    $where = $where->param({

+        title => 'Perl',

+        date => ['2010-11-11', '2011-03-05'],

+    });

 =head2 C<safety_character>

     my $safety_character = $self->safety_character;

-    $dbi                 = $self->safety_character($name);

+    $where = $self->safety_character("\w");

 =head1 METHODS

+L<DBIx::Custom::Where> inherits all methods from L<Object::Simple>

+and implements the following new ones.

+

 =head2 C<to_string>

     $where->to_string;

-Convert where clause to string correspoinding to param name.

+Convert where clause to string.

+

+double quote is override to execute C<to_string> method.

+

+    my $string_where = "$where";

 =cut

@@ -2207,7 +2207,7 @@ $result = $model->select(

 is_deeply($result->one, 

           {'table2_alias-key1' => 1, 'table2_alias-key3' => 4});

-test 'type() option';

+test 'type option'; # DEPRECATED!

 $dbi = DBIx::Custom->connect(

     data_source => 'dbi:SQLite:dbname=:memory:',

     dbi_option => {

@@ -2232,6 +2232,50 @@ $result = $dbi->execute('select length(key1) as key1_length from table1');

 $row = $result->one;

 is($row->{key1_length}, length $binary);

+

+test 'bind_type option';

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

+    data_source => 'dbi:SQLite:dbname=:memory:',

+    dbi_option => {

+        $DBD::SQLite::VERSION > 1.26 ? (sqlite_unicode => 1) : (unicode => 1)

+    }

+);

+$binary = pack("I3", 1, 2, 3);

+$dbi->execute('create table table1(key1, key2)');

+$dbi->insert(table => 'table1', param => {key1 => $binary, key2 => 'あ'}, bind_type => [key1 => DBI::SQL_BLOB]);

+$result = $dbi->select(table => 'table1');

+$row   = $result->one;

+is_deeply($row, {key1 => $binary, key2 => 'あ'}, "basic");

+$result = $dbi->execute('select length(key1) as key1_length from table1');

+$row = $result->one;

+is($row->{key1_length}, length $binary);

+

+$dbi->insert(table => 'table1', param => {key1 => $binary, key2 => 'あ'}, bind_type => [['key1'] => DBI::SQL_BLOB]);

+$result = $dbi->select(table => 'table1');

+$row   = $result->one;

+is_deeply($row, {key1 => $binary, key2 => 'あ'}, "basic");

+$result = $dbi->execute('select length(key1) as key1_length from table1');

+$row = $result->one;

+is($row->{key1_length}, length $binary);

+

+test 'model type attribute';

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

+    data_source => 'dbi:SQLite:dbname=:memory:',

+    dbi_option => {

+        $DBD::SQLite::VERSION > 1.26 ? (sqlite_unicode => 1) : (unicode => 1)

+    }

+);

+$binary = pack("I3", 1, 2, 3);

+$dbi->execute('create table table1(key1, key2)');

+$model = $dbi->create_model(table => 'table1', bind_type => [key1 => DBI::SQL_BLOB]);

+$model->insert(param => {key1 => $binary, key2 => 'あ'});

+$result = $dbi->select(table => 'table1');

+$row   = $result->one;

+is_deeply($row, {key1 => $binary, key2 => 'あ'}, "basic");

+$result = $dbi->execute('select length(key1) as key1_length from table1');

+$row = $result->one;

+is($row->{key1_length}, length $binary);

+

 test 'create_model';

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

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