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

 package DBIx::Custom;

-our $VERSION = '0.1656';

+our $VERSION = '0.1657';

 use 5.008001;

 use strict;

@@ -1469,48 +1469,40 @@ Result class, default to L<DBIx::Custom::Result>.

 =head2 C<(experimental) safety_character>

     my $safety_character = $self->safety_character;

+    $dbi                 = $self->safety_character($character);

 Regex of safety character consist of table and column name, default to '\w'.

-Note that you don't have to specify like "[\w]".

+Note that you don't have to specify like '[\w]'.

 =head2 C<user>

     my $user = $dbi->user;

     $dbi     = $dbi->user('Ken');

-User name.

-C<connect()> method use this value to connect the database.

+User name, used when C<connect()> is executed.

 =head1 METHODS

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

-and use all method of L<DBI>

+and use all methods of L<DBI>

 and implements the following new ones.

 =head2 C<(experimental) apply_filter>

     $dbi->apply_filter(

-        $table,

-        $column1 => {in => $infilter1, out => $outfilter1, end => $endfilter1}

-        $column2 => {in => $infilter2, out => $outfilter2, end =. $endfilter2}

+        'book',

+        $column1 => {out => $outfilter1, in => $infilter1, end => $endfilter1}

+        $column2 => {out => $outfilter2, in => $infilter2, end => $endfilter2}

         ...,

     );

-C<apply_filter> is automatically filter for columns of table.

-This have effect C<insert>, C<update>, C<delete>. C<select>

-and L<DBIx::Custom::Result> object. but this has'nt C<execute> method.

+Apply filter to specified column, C<out> is the direction from perl to database,

+C<in> is the direction from database to perl,

+C<end> is filter after C<in> filter.

-If you want to have effect C<execute()> method, use C<table>

-arguments.

-

-    $result = $dbi->execute(

-        "select * from table1 where {= key1} and {= key2};",

-         param => {key1 => 1, key2 => 2},

-         table => ['table1']

-    );

-

-You can use three name as column name.

+You can use three column name to apply filter to column data.

+                       (Example)

     1. column        : author

     2. table.column  : book.author

     3. table__column : book__author

@@ -315,17 +315,37 @@ Following SQL is executed.

 Next example.

     my $result = $dbi->select(

-        table    => 'book',

-        where    => {'book.name' => 'Perl'},

-        relation => {'book.id' => 'rental.book_id'}

+        table  => 'book',

+        column => ['company.name as company__name']

+        where  => {'book.name' => 'Perl'},

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

     );

-C<relation> is relation of tables. This is inner join.

+You can join table by C<join>.

 Following SQL is executed.

-    select * from book, rental where book.name = ? and book.id = rental.book_id;

+    select company.name as company__name from book

+      left outer join company on book.company_id = company.id

+      where book.name = ?;

+

+company_if of book and id of company is left outer joined.

+

+Note that only when C<where> or C<column> contain table name,

+C<join> is joined.

+if you specify the following option, C<join> is not joined

+because C<join> is not needed.

+    my $result = $dbi->select(

+        table  => 'book',

+        where  => {'name' => 'Perl'},

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

+    );

+

+Following SQL is executeed.

+

+    select * from book where book.name = ?;

+    

 Next example.

     my $result = $dbi->select(

@@ -1125,11 +1145,11 @@ This method is needed to be call after C<include_model()>.

     $dbi->setup_model;

-You can set C<relation>

+You can set C<join>

-    $model->relation({'book.company_id' => 'company.id'});

+    $model->join(['left outer join company on book.company_id = company.id']);

-This relation is used by C<select()>, C<select_at()>

+This C<join> is used by C<select()>, C<select_at()>

 =head2 Class name, Model name, Table name

@@ -321,19 +321,36 @@ C<column>は列名、C<where>は条件です。

 次のサンプルです。

     my $result = $dbi->select(

-        table    => 'book',

-        where    => {book.name => 'Perl'},

-        relation => {'book.id' => 'rental.book_id'}

+        table  => 'book',

+        column => ['company.name as company__name']

+        where  => {'book.name' => 'Perl'},

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

     );

-C<relation>テーブル間の関係です。これは内部結合です。

+C<join>でテーブルの結合を行うことができます。

 次のSQLが実行されます。

-bookテーブルのid列とrentalテーブルのbook_idが関連付けられます。

+    select company.name as company__name from book

+      left outer join company on book.company_id = company.id

+      where book.name = ?;

+

+bookテーブルのcompany_id列とcompanyテーブルのidが左外部結合されます。

+次のSQLが実行されます。

+

+C<join>されるのは、C<where>やC<column>にテーブル名が含まれている

+場合だけであることに注意してください。

+次のように指定した場合は結合の必要はないと判断されjoinはされません。

+

+    my $result = $dbi->select(

+        table  => 'book',

+        where  => {'name' => 'Perl'},

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

+    );

+

 次のSQLが実行されます。

-    select * from book, rental where book.name = ? and book.id = rental.book_id;

+    select * from book where book.name = ?;

 次のサンプルです。

@@ -1162,11 +1179,11 @@ C<filter>でC<apply_filter()>で適用されるフィルタを定義しておく

     $dbi->setup_model;

-モデルにはリレーションを設定することもできます。

+モデルにはC<join>を設定することもできます。

-    $model->relation({'book.company_id' => 'company.id'});

+    $model->join(['left outer join company on book.company_id = company.id']);

-ここで設定したリレーションはC<select()>, C<select_at()>で利用されます。

+ここで設定したC<join>はC<select()>, C<select_at()>で利用されます。

 =head2 クラス名、モデル名、テーブル名