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

 0.1723

     - removed EXPERIMENTAL call_dbi method from DBIx::Custom::Model

     - removed EXPERIMENTAL map_param method from DBIx::Custom

+    - removed EXPERIMENTAL the following methods from DBIx::Custom::Where

+      if, map

+    - removed EXPERIMENTAL flag from the following DBIx::Custom::Model methods

+      count, execute

     - removed EXPERIMENTAL flag from the following DBIx::Custom::Result mehotds

       filter_on, type_rule, type_rule_off, type_rule_on, type_rule1_off,

       type_rule1_on, type_rule2_off, type_rule2_on

@@ -12,8 +16,7 @@

       exclude_table, user_column_info,

       user_table_info, available_datatype, available_typename,

       assign_param, count, get_column_info, get_table_info

-      order, show_datatype, show_typename methods, type_rule,

-      mapper

+      order, show_datatype, show_typename methods, show_tables, type_rule,

     - added EXPERIMENTAL update_timestamp method to DBIx::Custom

     - added EXPERIMENTAL insert_timestamp method to DBIx::Custom

     - removed EXPERIMENTAL timestamp attribute from DBIx::Custom

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

 Parameter for timestamp columns when C<insert> method is executed

 with C<timestamp> option.

-=head2 C<mapper>

+=head2 C<mapper EXPERIMENTAL>

     my $mapper = $dbi->mapper(param => $param);

@@ -3429,7 +3429,7 @@ Show data type of the columns of specified table.

 This data type is used in C<type_rule>'s C<from1> and C<from2>.

-=head2 C<show_tables EXPERIMETNAL>

+=head2 C<show_tables>

     $dbi->show_tables;

@@ -39,11 +39,11 @@ C<Microsoft SQL Server>, C<Microsoft Access>, C<DB2> or anything,

 =item *

-Filtering by data type or column name(EXPERIMENTAL)

+Filtering by data type or column name

 =item *

-Create C<order by> clause flexibly(EXPERIMENTAL)

+Create C<order by> clause flexibly

 =back

@@ -62,8 +62,15 @@ foreach my $method (@methods) {

 sub execute {

     my $self = shift;

-    push @_, ($_ => $self->$_) for qw/table bind_type primary_key type/;

-    return $self->dbi->execute(@_);

+    return $self->dbi->execute(

+        shift,

+        shift,

+        table => $self->table,

+        bind_type => $self->bind_type,

+        primary_key => $self->primary_key,

+        type => $self->type,

+        @_

+    );

 }

 sub DESTROY { }

@@ -167,22 +174,7 @@ L<DBIx::Custom::Model> inherits all methods from L<Object::Simple>,

 and you can use all methods of L<DBIx::Custom> and L<DBI>

 and implements the following new ones.

-=head2 C<call_dbi> EXPERIMENTAL

-

-    $model->call_dbi('insert',

-      {args => ['table', 'primary_key' 'bind_type']}, @_)

-

-Call L<DBIx::Custom>(or subclass) method. you can add

-attribute values of model to arguments by C<args> option.

-

-Generally this method is used when you want to added dbi method to model.

-

-    sub insert {

-        shift->call_dbi('insert',

-          {args => ['table', 'primary_key' 'bind_type']}, @_);

-    }

-

-=head2 C<count> EXPERIMENTAL

+=head2 C<count>

     my $count = $model->count;

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

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

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

-=head2 C<execute EXPERIMENTAL>

+=head2 C<execute>

     $model->execute(...);

@@ -12,114 +12,6 @@ push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 has [qw/dbi param/],

     clause => sub { [] };

-sub map {

-    my ($self, %map) = @_;

-    

-    if ($self->if ne 'exists' || keys %map) {

-        my $param = $self->_map_param($self->param, %map);

-        $self->param($param);

-    }

-    return $self;

-}

-

-sub _map_param {

-    my $self = shift;

-    my $param = shift;

-    

-    return $param if !defined $param;

-    

-    my %map = @_;

-    

-    # Mapping

-    my $map_param = {};

-    foreach my $key (keys %$param) {

-    

-        my $value_cb;

-        my $condition;

-        my $map_key;

-        

-        # Get mapping information

-        if (ref $map{$key} eq 'ARRAY') {

-            foreach my $some (@{$map{$key}}) {

-                $map_key = $some unless ref $some;

-                $condition = $some->{if} if ref $some eq 'HASH';

-                $value_cb = $some if ref $some eq 'CODE';

-            }

-        }

-        elsif (defined $map{$key}) {

-            $map_key = $map{$key};

-        }

-        else {

-            $map_key = $key;

-        }

-        

-        $value_cb ||= sub { $_[0] };

-        $condition ||= $self->if || 'exists';

-        $condition = $self->_if_to_sub($condition);

-

-        # Map parameter

-        my $value;

-        if (ref $condition eq 'CODE') {

-            if (ref $param->{$key} eq 'ARRAY') {

-                $map_param->{$map_key} = [];

-                for (my $i = 0; $i < @{$param->{$key}}; $i++) {

-                    $map_param->{$map_key}->[$i]

-                      = $condition->($param->{$key}->[$i]) ? $param->{$key}->[$i]

-                      : $self->dbi->not_exists;

-                }

-            }

-            else {

-                $map_param->{$map_key} = $value_cb->($param->{$key})

-                  if $condition->($param->{$key});

-            }

-        }

-        elsif ($condition eq 'exists') {

-            if (ref $param->{$key} eq 'ARRAY') {

-                $map_param->{$map_key} = [];

-                for (my $i = 0; $i < @{$param->{$key}}; $i++) {

-                    $map_param->{$map_key}->[$i]

-                      = exists $param->{$key}->[$i] ? $param->{$key}->[$i]

-                      : $self->dbi->not_exists;

-                }

-            }

-            else {

-                $map_param->{$map_key} = $value_cb->($param->{$key})

-                  if exists $param->{$key};

-            }

-        }

-        else { croak qq/Condition must be code reference or "exists" / . _subname }

-    }

-    

-    return $map_param;

-}

-

-sub if {

-    my $self = shift;

-    if (@_) {

-        my $if = $_[0];

-        

-        $if = $self->_if_to_sub($if);

-        $self->{if} = $if;

-        return $self;

-    }

-    $self->{if} = 'exists' unless exists $self->{if};

-    return $self->{if};

-}

-

-sub _if_to_sub {

-    my ($self, $if) = @_;

-    $if = $if eq 'exists' ? $if

-            : $if eq 'defined' ? sub { defined $_[0] }

-            : $if eq 'length'  ? sub { defined $_[0] && length $_[0] }

-            : ref $if eq 'CODE' ? $if

-            : undef;

-

-    croak "You can must specify right value to C<if> " . _subname

-      unless $if;

-    

-    return $if;

-}

-

 sub new {

     my $self = shift->SUPER::new(@_);

@@ -149,18 +41,6 @@ sub to_string {

     $clause = ['and', $clause] unless ref $clause eq 'ARRAY';

     $clause->[0] = 'and' unless @$clause;

-    # Map condition

-    my $if = $self->if || '';

-    $if = $if eq 'exists' ? $if

-            : $if eq 'defined' ? sub { defined $_[0] }

-            : $if eq 'length'  ? sub { length $_[0] }

-            : ref $if eq 'CODE' ? $if

-            : undef;

-    

-    croak "You can must specify right value to C<if> " . _subname

-      unless $if;

-    $self->{_if} = $if;

-    

     # Parse

     my $where = [];

     my $count = {};

@@ -314,69 +194,6 @@ L<DBIx::Custom> object.

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

 and implements the following new ones.

-=head2 C<if EXPERIMENTAL>

-    

-    my $if = $where->if($condition);

-    $where->if($condition);

-

-C<if> is default of C<map> method C<if> option.

-

-=head2 C<map EXPERIMENTAL>

-

-Mapping parameter key and value. C<param> is converted based on,

-so this method must be called after C<param> is set.

-Set C<if> if you need before C<map> method call.

-

-    $where->map(

-        'id' => 'book.id',

-        'author' => ['book.author' => sub { '%' . $_[0] . '%' }],

-        'price' => [

-            'book.price', {if => sub { length $_[0] }

-        ]

-    );

-

-The followin parameter

-

-    {

-        id => 1,

-        auhtor => 'Ken',

-        price => 1000

-    }

-

-is converted to

-

-    {

-        'book.id' => 1,

-        'book.author' => '%Ken%',

-        'book.price' => 1000

-    }

-

-The following option is available.

-

-=over 4

-

-=item * C<if>

-

-By default, if parameter key is exists, mapping is done.

-    

-    if => 'exists';

-

-In case C<defined> is specified, if the value is defined,

-mapping is done.

-

-    if => 'defined';

-

-In case C<length> is specified, the value is defined

-and the length is bigger than 0, mappting is done.

-

-    if => 'length';

-

-You can also subroutine like C<sub { defined $_[0] }> for mappging.

-

-    if => sub { defined $_[0] }

-

-=back

-

 =head2 C<to_string>

     $where->to_string;

@@ -1609,15 +1609,6 @@ $result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

 $row = $result->all;

 is_deeply($row, [{$key1 => 1, $key2 => 2}]);

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

-$where->param({$key1 => undef});

-$where->if('defined');

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}]);

-

 $where = $dbi->where;

 $where->clause(['or', ":${key1}{=}", ":${key1}{=}"]);

 $where->param({$key1 => [undef, undef]});

@@ -1628,133 +1619,6 @@ $result = $dbi->execute("select * from $table1 $where", {$key1 => [0, 1]});

 $row = $result->all;

 is_deeply($row, [{$key1 => 1, $key2 => 2}]);

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

-$where->param({$key1 => [undef, undef]});

-$where->if('defined');

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => [1, 0]});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}]);

-$result = $dbi->execute("select * from $table1 $where", {$key1 => [0, 1]});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}]);

-

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

-$where->param({$key1 => 0});

-$where->if('length');

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}]);

-

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

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

-$where->if('length');

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}]);

-

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

-$where->param({$key1 => 5});

-$where->if(sub { ($_[0] || '') eq 5 });

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}]);

-

-$where = $dbi->where;

-$where->clause(['and', ":${key1}{=}"]);

-$where->param({$key1 => 7});

-$where->if(sub { ($_[0] || '') eq 5 });

-$where->map;

-$result = $dbi->execute("select * from $table1 $where", {$key1 => 1});

-$row = $result->all;

-is_deeply($row, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}]);

-

-$where = $dbi->where;

-$where->param({id => 1, author => 'Ken', price => 1900});

-$where->map(id => "$table1.id",

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

-    price => ["$table1.price", {if => sub { $_[0] eq 1900 }}]

-);

-is_deeply($where->param, {"$table1.id" => 1, "$table1.author" => '%Ken%',

-  "$table1.price" => 1900});

-

-$where = $dbi->where;

-$where->param({id => 0, author => 0, price => 0});

-$where->map(

-    id => "$table1.id",

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

-    price => ["$table1.price", sub { '%' . $_[0] . '%' },

-      {if => sub { $_[0] eq 0 }}]

-);

-is_deeply($where->param, {"$table1.id" => 0, "$table1.author" => '%0%', "$table1.price" => '%0%'});

-

-$where = $dbi->where;

-$where->param({id => '', author => '', price => ''});

-$where->if('length');

-$where->map(

-    id => "$table1.id",

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

-    price => ["$table1.price", sub { '%' . $_[0] . '%' },

-      {if => sub { $_[0] eq 1 }}]

-);

-is_deeply($where->param, {});

-

-$where = $dbi->where;

-$where->param({id => undef, author => undef, price => undef});

-$where->if('length');

-$where->map(

-    id => "$table1.id",

-    price => ["$table1.price", {if => 'exists'}]

-);

-is_deeply($where->param, {"$table1.price" => undef});

-

-$where = $dbi->where;

-$where->param({price => 'a'});

-$where->if('length');

-$where->map(

-    id => ["$table1.id", {if => 'exists'}],

-    price => ["$table1.price", sub { '%' . $_[0] }, {if => 'exists'}]

-);

-is_deeply($where->param, {"$table1.price" => '%a'});

-

-$where = $dbi->where;

-$where->param({id => [1, 2], author => 'Ken', price => 1900});

-$where->map(

-    id => "$table1.id",

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

-    price => ["$table1.price", {if => sub { $_[0] eq 1900 }}]

-);

-is_deeply($where->param, {"$table1.id" => [1, 2], "$table1.author" => '%Ken%',

-  "$table1.price" => 1900});

-

-$where = $dbi->where;

-$where->if('length');

-$where->param({id => ['', ''], author => 'Ken', price => 1900});

-$where->map(

-    id => "$table1.id",

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

-    price => ["$table1.price", {if => sub { $_[0] eq 1900 }}]

-);

-is_deeply($where->param, {"$table1.id" => [$dbi->not_exists, $dbi->not_exists], "$table1.author" => '%Ken%',

-  "$table1.price" => 1900});

-

-$where = $dbi->where;

-$where->param({id => ['', ''], author => 'Ken', price => 1900});

-$where->map(

-    id => ["$table1.id", {if => 'length'}],

-    author => ["$table1.author", sub { '%' . $_[0] . '%' }, {if => 'defined'}],

-    price => ["$table1.price", {if => sub { $_[0] eq 1900 }}]

-);

-is_deeply($where->param, {"$table1.id" => [$dbi->not_exists, $dbi->not_exists], "$table1.author" => '%Ken%',

-  "$table1.price" => 1900});

-

 test 'register_tag_processor';

 $dbi = DBIx::Custom->connect;

 $dbi->register_tag_processor(