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

-0.1667

+0.1670

+    - removed EXPERIMETNAL select() column hash option. it's a little complex

+

+0.1669

     - renamed update_param to update_param_tag, update_param is DEPRECATED!

     - renamed insert_param to insert_param_tag, insert_param is DEPRECATED!

-    - added EXPERIMENTAL updat_param no_set option.

+0.1668

+    - added EXPERIMENTAL update_param no_set option.

     - added EXPERIMENTAL reserved_word_quote attribute.

 0.1666

     - removed from cache() and cache_method() document for a while and cache() value

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

 package DBIx::Custom;

-our $VERSION = '0.1669';

+our $VERSION = '0.1670';

 use 5.008001;

 use strict;

@@ -867,6 +867,7 @@ sub select {

     croak qq{"join" must be array reference}

       unless ref $join eq 'ARRAY';

     my $relation = delete $args{relation};

+    my $param = delete $args{param} || {};

     # Add relation tables(DEPRECATED!);

     $self->_add_relation_table($tables, $relation);

@@ -875,58 +876,14 @@ sub select {

     my @sql;

     push @sql, 'select';

+    # Column clause

     if ($columns) {

-

         $columns = [$columns] if ! ref $columns;

-        

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

-            # Find tables

-            my $main_table;

-            my %tables;

-            if ($columns->{table}) {

-                foreach my $table (@{$columns->{table}}) {

-                    if (($table || '') eq $tables->[-1]) {

-                        $main_table = $table;

-                    }

-                    else {

-                        $tables{$table} = 1;

-                    }

-                }

-            }

-            elsif ($columns->{all}) {

-                $main_table = $tables->[-1] || '';

-                foreach my $j (@$join) {

-                    my $tables = $self->_tables($j);

-                    foreach my $table (@$tables) {

-                        $tables{$table} = 1;

-                    }

-                }

-                delete $tables{$main_table};

-            }

-            

-            push @sql, $columns->{prepend} if $columns->{prepend};

-            

-            # Column clause of main table

-            if ($main_table) {

-                push @sql, $self->model($main_table)->mycolumn;

-                push @sql, ',';

-            }

-            

-            # Column cluase of other tables

-            foreach my $table (keys %tables) {

-                unshift @$tables, $table;

-                push @sql, $self->model($table)->column($table);

-                push @sql, ',';

-            }

-            pop @sql if $sql[-1] eq ',';

-        }

-        else {

-            foreach my $column (@$columns) {

-                unshift @$tables, @{$self->_tables($column)};

-                push @sql, ($column, ',');

-            }

-            pop @sql if $sql[-1] eq ',';

+        foreach my $column (@$columns) {

+            unshift @$tables, @{$self->_tables($column)};

+            push @sql, ($column, ',');

         }

+        pop @sql if $sql[-1] eq ',';

     }

     # "*" is default

@@ -952,7 +909,8 @@ sub select {

     # Where

     my $w = $self->_where($where);

-    $where = $w->param;

+    $param = keys %$param ? $self->merge_param($param, $w->param)

+                         : $w->param;

     # String where

     my $swhere = "$w";

@@ -982,7 +940,7 @@ sub select {

     # Execute query

     my $result = $self->execute(

         $query,

-        param  => $where, 

+        param  => $param, 

         table => $tables,

         %args

     );

@@ -1399,6 +1357,9 @@ sub _where {

         $w = $where;

     }

     elsif (ref $where eq 'ARRAY') {

+        warn "\$dbi->select(where => [CLAUSE, PARAMETER]) is DEPRECATED." .

+             "use \$dbi->select(where => \$dbi->where(clause => " .

+             "CLAUSE, param => PARAMETER));";

         $w = $self->where(

             clause => $where->[0],

             param  => $where->[1]

@@ -2397,47 +2358,6 @@ Default is '*' unless C<column> is specified.

     # Default

     $dbi->select(column => '*');

-You can use hash option in C<column>

-

-=over 4

-

-=item all EXPERIMENTAL

-

-Colum clause, contains all columns of joined table. This is true or false value

-

-    $dbi->select(column => {all => 1});

-

-If main table is C<book> and joined table is C<company>,

-This create the following column clause.

-

-    book.author as author

-    book.company_id as company_id

-    company.id as company__id

-    company.name as company__name

-

-Columns of main table is consist of only column name,

-Columns of joined table is consist of table and column name joined C<__>.

-

-Note that this option is failed unless modles is included and

-C<columns> attribute is set.

-

-    # Generally do the following way before using all_column option

-    $dbi->include_model('MyModel')->setup_model;

-

-=item table EXPERIMENTAL

-

-You can also specify table names by C<table> option

-

-    $dbi->select(column => {table => ['book', 'company']});

-

-=item prepend EXPERIMENTAL

-

-You can add before created statement

-

-    $dbi->select(column => {prepend => 'SOME', all => 1});

-

-=back

-

 =item C<where>

 Where clause. This is hash reference or L<DBIx::Custom::Where> object,

@@ -6,6 +6,8 @@ use utf8;

 use Encode qw/encode_utf8 decode_utf8/;

 use Data::Dumper;

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

+

 BEGIN {

     eval { require DBD::SQLite; 1 }

         or plan skip_all => 'DBD::SQLite required';

@@ -1932,7 +1934,6 @@ $rows = $dbi->select(

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}],

           'reserved_word_quote');

-test 'model join and column attribute and all_column option';

 {

     package MyDBI8;

@@ -1946,22 +1947,6 @@ test 'model join and column attribute and all_column option';

         return $self;

     }

 }

-$dbi = MyDBI8->connect($NEW_ARGS->{0});

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

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

-$dbi->setup_model;

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

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

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

-$result = $model->select_at(

-    column => {table => ['table1', 'table2'], prepend => 'table1.key1 as key1_1,'},

-    where => 1

-);

-is_deeply($result->fetch_hash_first,

-          {key1_1 => 1, key1 => 1, key2 => 2, table2__key1 => 1, table2__key3 => 3});

-$result = $model->select(column => {all => 1});

-is_deeply($result->fetch_hash_first,

-          {key1 => 1, key2 => 2, table2__key1 => 1, table2__key3 => 3});

 test 'mycolumn';

 $dbi = MyDBI8->connect($NEW_ARGS->{0});