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

 0.1691

+    - EXPERIMTANL column method think about separator

+    - removed EXPERIMENTAL col method.

     - added EXPERIMENTAL separater method

     - added EXPERIMENTAL select prefix option.

     - fixed bug that data_source DEPRECATED warnings pirnt STDERR

@@ -168,30 +168,20 @@ sub assign_param {

     return $tag;

 }

-sub col {

-    my ($self, $table, $columns) = @_;

-    

-    # Reserved word quote

-    my $q = $self->reserved_word_quote;

-    

-    # Column clause

-    my @column;

-    $columns ||= [];

-    push @column, "$q$table$q.$q$_$q as $q${table}.$_$q" for @$columns;

-    

-    return join (', ', @column);

-}

-

 sub column {

     my ($self, $table, $columns) = @_;

     # Reserved word quote

     my $q = $self->reserved_word_quote;

+    # Separator

+    my $separator = $self->separator;

+    

     # Column clause

     my @column;

     $columns ||= [];

-    push @column, "$q$table$q.$q$_$q as $q${table}__$_$q" for @$columns;

+    push @column, "$q$table$q.$q$_$q as $q${table}${separator}$_$q"

+      for @$columns;

     return join (', ', @column);

 }

@@ -911,7 +901,7 @@ sub select {

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

         foreach my $column (@$columns) {

             if (ref $column eq 'HASH') {

-                $column = $self->col(%$column) if ref $column eq 'HASH';

+                $column = $self->column(%$column) if ref $column eq 'HASH';

             }

             elsif (ref $column eq 'ARRAY') {

                 croak "Format must be [COLUMN, as => ALIAS] " . _subname

@@ -82,23 +82,6 @@ sub column {

     return $self->dbi->column($table, $columns);

 }

-sub col {

-    my ($self, $table, $columns) = @_;

-    

-    $self->{_table_alias} ||= {};

-    my $dist;

-    $dist = $self->dbi->{_table_alias}{$table}

-          ? $self->dbi->{_table_alias}{$table}

-          : $table;

-    

-    $self->dbi->{_model_from} ||= {};

-    my $model = $self->dbi->{_model_from}->{$dist};

-    

-    $columns ||= $self->model($model)->columns;

-    

-    return $self->dbi->col($table, $columns);

-}

-

 sub DESTROY { }

 sub method {

@@ -1868,6 +1868,7 @@ test 'mycolumn and column';

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

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

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

+$dbi->separator('__');

 $dbi->setup_model;

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

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

@@ -2112,7 +2113,7 @@ $result = $model->select_at(

     ]

 );

 is_deeply($result->one,

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

+          {key1 => 1, key2 => 2, 'table2.key1' => 1, 'table2.key3' => 3});

 $result = $model->select_at(

     column => [

@@ -2121,7 +2122,7 @@ $result = $model->select_at(

     ]

 );

 is_deeply($result->one,

-          {key1 => 1, table2__key1 => 1});

+          {key1 => 1, 'table2.key1' => 1});

 $result = $model->select_at(

     column => [

         $model->mycolumn(['key1']),

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

     where => {'table2_alias.key3' => 2}

 );

 is_deeply($result->one, 

-          {table2_alias__key1 => 1, table2_alias__key3 => 48});

+          {'table2_alias.key1' => 1, 'table2_alias.key3' => 48});

 test 'type() option';

 $dbi = DBIx::Custom->connect(

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

     where => {'table1.key1' => 1}

 );

 is_deeply($result->one,

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

+          {key1 => 1, key2 => 2, 'table2.key1' => 1, 'table2.key3' => 3});

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

 test 'model method';

@@ -2557,7 +2558,7 @@ is($row->{key1}, 1);

 is($row->{key2}, 2);

 is($row->{key3}, 3);

-test 'col';

+test 'column separator is default .';

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

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

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

@@ -2566,14 +2567,14 @@ $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(

-    column => [$model->col('table2')],

+    column => [$model->column('table2')],

     where => {'table1.key1' => 1}

 );

 is_deeply($result->one,

           {'table2.key1' => 1, 'table2.key3' => 3});

 $result = $model->select(

-    column => [$model->col('table2' => [qw/key1 key3/])],

+    column => [$model->column('table2' => [qw/key1 key3/])],

     where => {'table1.key1' => 1}

 );

 is_deeply($result->one,

@@ -2754,6 +2755,20 @@ is_deeply($result->one,

           {key1 => 2, key2 => 2, 'table2.key1' => 3, 'table2.key3' => 9});

 is_deeply($model2->select->one, {key1 => 3, key3 => 9});

+$dbi->separator('__');

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

+$result = $model->select(

+    column => [

+        $model->mycolumn,

+        {table2 => [qw/key1 key3/]}

+    ],

+    where => {'table1.key1' => 1}

+);

+is_deeply($result->one,

+          {key1 => 2, key2 => 2, 'table2__key1' => 3, 'table2__key3' => 9});

+is_deeply($model2->select->one, {key1 => 3, key3 => 9});

+

+

 test 'filter_off';

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

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