@@ -11,7 +11,7 @@ my $builder = Module::Build->new(

         'Test::More' => 0,

     },

     requires => {

-        'Object::Simple' => 2.0701,

+        'Object::Simple' => 2.0702,

         'DBI'            => 1.605,

     },

     add_to_cleanup      => [ 'DBI-Custom-*' ],

@@ -12,6 +12,7 @@ use DBI::Custom::Result;

 sub user        : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub password    : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub data_source : ClassObjectAttr { initialize => {clone => 'scalar'} }

+sub database    : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub dbi_option : ClassObjectAttr { initialize => {clone => 'hash', 

                                                   default => sub { {} } } }

@@ -19,6 +20,8 @@ sub dbi_option : ClassObjectAttr { initialize => {clone => 'hash',

 sub bind_filter  : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub fetch_filter : ClassObjectAttr { initialize => {clone => 'scalar'} }

+sub no_filters   : ClassObjectAttr { initialize => {clone => 'array'} }

+

 sub filters : ClassObjectAttr {

     type => 'hash',

     deref => 1,

@@ -47,6 +50,7 @@ sub dbh          : Attr {}

 ### Methods

+

 # Add filter

 sub add_filter {

     my $invocant = shift;

@@ -143,44 +147,46 @@ sub run_tranzaction {

     $self->_auto_commit(1);

 }

-# Create SQL from SQL template

-sub _create_sql {

-    my $self = shift;

+sub create_query {

+    my ($self, $template) = @_;

-    my ($sql, @bind) = $self->sql_template->create_sql(@_);

+    # Create query from SQL template

+    my $query = $self->sql_template->create_query($template);

-    return ($sql, @bind);

-}

-

-# Prepare and execute SQL

-sub query {

-    my ($self, $template, $values, $filter)  = @_;

+    # Create Query object;

+    my $query = DBI::Custom::Query->new($query);

-    my $sth_options;

+    # connect if not

+    $self->connect unless $self->connected;

-    # Rearrange when argumets is hash referecne 

-    if (ref $template eq 'HASH') {

-        my $args = $template;

-        ($template, $values, $filter, $sth_options)

-          = @{$args}{qw/template values filter sth_options/};

-    }

+    # Prepare statement handle

+    my $sth = $self->dbh->prepare($query->{sql});

-    $filter ||= $self->bind_filter;

+    $query->sth($sth);

-    my ($sql, @bind_values) = $self->_create_sql($template, $values, $filter);

+    return $query;

+}

+

+sub execute {

+    my ($self, $query, $params)  = @_;

-    $self->connect unless $self->connected;

+    # Create query if First argument is template

+    if (!ref $query) {

+        my $template = $query;

+        $query = $sefl->create_query($tempalte);

+    }

-    my $sth = $self->dbh->prepare($sql);

+    # Set bind filter

+    $query->bind_filter($self->bind_filter) unless $query->bind_filter;

-    if ($sth_options) {

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

-            $sth->{$key} = $sth_options->{$key};

-        }

-    }

+    # Set no filter keys

+    $query->no_filters($self->no_filters) unless $query->no_filters;

+    

+    # Create bind value

+    my $bind_values = $self->_build_bind_values($query, $params);

     # Execute

-    my $ret_val = $sth->execute(@bind_values);

+    my $ret_val = $query->sth->execute(@$bind_values);

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

@@ -194,34 +200,67 @@ sub query {

     return $ret_val;

 }

-# Prepare and execute raw SQL

-sub query_raw_sql {

-    my ($self, $sql, @bind_values) = @_;

-    

-    # Connect

-    $self->connect unless $self->connected;

-    

-    # Add semicolon if not exist;

-    $sql .= ';' unless $sql =~ /;$/;

+sub _build_bind_values {

+    my ($self, $query, $params) = @_;

+    my $bind_filter = $query->bind_filter;

+    my $no_filters_map  = $query->_no_filters_map || {};

-    # Prepare

-    my $sth = $self->dbh->prepare($sql);

+    # binding values

+    my @bind_values;

-    # Execute

-    my $ret_val = $sth->execute(@bind_values);

-    

-    # Return resultset if select statement is executed

-    if ($sth->{NUM_OF_FIELDS}) {

-        my $result_class = $self->result_class;

-        my $result = $result_class->new({

-            sth => $sth,

-            fetch_filter => $self->fetch_filter

-        });

-        return $result;

+    # Filter and sdd bind values

+    foreach my $param_key_info (@$param_key_infos) {

+        my $filtering_key = $param_key_info->{key};

+        my $access_keys = $param_key_info->{access_keys};

+        

+        my $original_key = $param_key_info->{original_key} || '';

+        my $table        = $param_key_info->{table}        || '';

+        my $column       = $param_key_info->{column}       || '';

+        

+        ACCESS_KEYS :

+        foreach my $access_key (@$access_keys) {

+            my $root_params = $params;

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

+                my $key = $access_key->[$i];

+                

+                croak("'access_keys' each value must be string or array reference")

+                  unless (ref $key eq 'ARRAY' || ($key && !ref $key));

+                

+                if ($i == @$access_key - 1) {

+                    if (ref $key eq 'ARRAY') {

+                        if ($bind_filter && !$no_filters_map->{$original_key}) {

+                            push @bind_values, $bind_filter->($root_params->[$key->[0]], $original_key, $table, $column);

+                        }

+                        else {

+                            push @bind_values, scalar $root_params->[$key->[0]];

+                        }

+                    }

+                    else {

+                        next ACCESS_KEYS unless exists $root_params->{$key};

+                        if ($bind_filter && !$no_filters_map->{$original_key}) {

+                            push @bind_values, scalar $bind_filter->($root_params->{$key}, $original_key, $table, $column);

+                        }

+                        else {

+                            push @bind_values, scalar $root_params->{$key};

+                        }

+                    }

+                    return @bind_values;

+                }

+                

+                if ($key eq 'ARRAY') {

+                    $root_params = $root_params->[$key->[0]];

+                }

+                else {

+                    next ACCESS_KEYS unless exists $root_params->{$key};

+                    $root_params = $root_params->{$key};

+                }

+            }

+        }

+        croak("Cannot find key");

     }

-    return $ret_val;

 }

+

 Object::Simple->build_class;

 =head1 NAME

@@ -237,6 +276,9 @@ Version 0.0101

 =head1 SYNOPSIS

   my $dbi = DBI::Custom->new;

+  

+  my $query = $dbi->create_query($template);

+  $dbi->execute($query);

 =head1 CLASS-OBJECT ACCESSORS

@@ -41,12 +41,12 @@ sub create_table1 {

 sub insert {

     my ($self, @values_list) = @_;

-    my $table = ref $values_list[0] ? '' : shift;

+    my $table = ref $params_list[0] ? '' : shift;

     $table ||= 't1';

-    foreach my $values (@values_list) {

-        my $sql = $self->dbi->query(

-            "insert into $table {insert_values}", {insert_values => $values}

+    foreach my $params (@values_list) {

+        my $sql = $self->dbi->execute(

+            "insert into $table {insert_values}", {insert_values => $params}

         );

     }

     return $self;

@@ -69,7 +69,7 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

     my @rows;

     my $rows;

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     @rows = ();

     while (my $row = $r->fetch) {

@@ -78,7 +78,7 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

     is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     @rows = ();

     while (my @row = $r->fetch) {

@@ -87,7 +87,7 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

     is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch list context');

-    $r = $dbi->query("select k1, k2 from t1;");

+    $r = $dbi->execute("select k1, k2 from t1;");

     @rows = ();

     while (my $row = $r->fetch_hash) {

@@ -96,7 +96,7 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

     is_deeply(\@rows, [{k1 => 1, k2 => 2}, {k1 => 3, k2 => 4}], 'fetch_hash');

-    $r = $dbi->query("select k1, k2 from t1;");

+    $r = $dbi->execute("select k1, k2 from t1;");

     @rows = ();

     while (my %row = $r->fetch_hash) {

@@ -105,25 +105,25 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

     is_deeply(\@rows, [{k1 => 1, k2 => 2}, {k1 => 3, k2 => 4}], 'fetch hash list context');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     $rows = $r->fetch_all;

     is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     @rows = $r->fetch_all;

     is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all list context');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     @rows = $r->fetch_all_hash;

     is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all_hash');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     @rows = $r->fetch_all;

     is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all_hash list context');

@@ -137,14 +137,14 @@ $t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub

         return $value;

     });

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     $rows = $r->fetch_all;

     is_deeply($rows, [[3, 2], [3, 4]], 'fetch_filter array');

-    $r = $dbi->query("select k1, k2 from t1");

+    $r = $dbi->execute("select k1, k2 from t1");

     $rows = $r->fetch_all_hash;