@@ -12,66 +12,40 @@ use DBIx::Custom::SQL::Template;

 ### Accessors

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

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

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

-

-sub options : ClassObjectAttr {

-    type       => 'hash',

-    initialize => {clone => 'hash', default => sub { {} }}

-}

-

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

-sub host         : ClassObjectAttr { initialize => {clone => 'scalar'} }

-sub port         : ClassObjectAttr { initialize => {clone => 'scalar'} }

+sub dbh : Attr {}

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

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

+sub _query_caches     : ClassAttr { type => 'hash',  build => sub {{}} }

+sub _query_cache_keys : ClassAttr { type => 'array', build => sub {[]} }

+sub query_cache_max   : ClassAttr { build => 50 }

-sub no_bind_filters : ClassObjectAttr {

-    type       => 'array',

-    initialize => {clone => 'array', default => sub { [] }}

-}

+sub user         : HybridAttr { clone => 'scalar' }

+sub password     : HybridAttr { clone => 'scalar' }

+sub data_source  : HybridAttr { clone => 'scalar' }

+sub database     : HybridAttr { clone => 'scalar' }

+sub host         : HybridAttr { clone => 'scalar' }

+sub port         : HybridAttr { clone => 'scalar' }

+sub bind_filter  : HybridAttr { clone => 'scalar' }

+sub fetch_filter : HybridAttr { clone => 'scalar' }

-sub no_fetch_filters : ClassObjectAttr {

-    type => 'array',

-    initialize => {clone => 'array', default => sub { [] }}

-}

+sub no_bind_filters  : HybridAttr { type  => 'array', build => sub {[]}, 

+                                    clone => 'array' }

-sub filters : ClassObjectAttr {

-    type => 'hash',

-    deref => 1,

-    initialize => {

-        clone   => 'hash',

-        default => sub { {} }

-    }

-}

+sub no_fetch_filters : HybridAttr { type  => 'array', build => sub { [] },

+                                    clone => 'array' }

-sub formats : ClassObjectAttr {

-    type => 'hash',

-    deref => 1,

-    initialize => {

-        clone   => 'hash',

-        default => sub { {} }

-    }

-}

+sub options : HybridAttr { type  => 'hash', build => sub {{}}, clone => 'hash' } 

-sub result_class : ClassObjectAttr {

-    initialize => {

-        clone   => 'scalar',

-        default => 'DBIx::Custom::Result'

-    }

-}

+sub filters : HybridAttr { type  => 'hash', build => sub {{}},

+                           clone => 'hash', deref => 1 }

-sub sql_tmpl : ClassObjectAttr {

-    initialize => {

-        clone   => sub {$_[0] ? $_[0]->clone : undef},

-        default => sub {DBIx::Custom::SQL::Template->new}

-    }

-}

+sub formats : HybridAttr { type  => 'hash', build => sub { {} },

+                           clone => 'hash', deref => 1 }

-sub dbh : Attr {}

+sub result_class : HybridAttr { build => 'DBIx::Custom::Result',

+                                clone => 'scalar' }

+sub sql_tmpl : HybridAttr { build => sub {DBIx::Custom::SQL::Template->new},

+                            clone => sub {$_[0] ? $_[0]->clone : undef} }

 ### Methods

@@ -732,14 +706,6 @@ sub select {

     return $result;

 }

-sub _query_caches     : ClassAttr { type => 'hash',

-                                    auto_build => sub {shift->_query_caches({}) } }

-                                    

-sub _query_cache_keys : ClassAttr { type => 'array',

-                                    auto_build => sub {shift->_query_cache_keys([])} }

-                                    

-sub query_cache_max   : ClassAttr { auto_build => sub {shift->query_cache_max(50)} }

-

 sub _add_query_cache {

     my ($class, $template, $query) = @_;

     my $query_cache_keys = $class->_query_cache_keys;

@@ -1,5 +1,5 @@

 package DBIx::Custom::SQL::Template;

-use Object::Simple;

+use Object::Simple; Object::Simple->build_class;

 use strict;

 use warnings;

@@ -7,23 +7,21 @@ use Carp 'croak';

 use DBIx::Custom::Query;

-# Accessor is created by Object::Simple.

-

-### Class-Object accessors

-

-# Tag start

-sub tag_start   : ClassObjectAttr {

-    initialize => {default => '{', clone => 'scalar'}

-}

-

-# Tag end

-sub tag_end     : ClassObjectAttr {

-    initialize => {default => '}', clone => 'scalar'}

-}

-

-# Tag syntax

-sub tag_syntax  : ClassObjectAttr {

-    initialize => {default => <<'EOS', clone => 'scalar'}}

+__PACKAGE__->add_tag_processor(

+    '?'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '='      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '<>'     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '>'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '<'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '>='     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    '<='     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    'like'   => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

+    'in'     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_in_tag,

+    'insert' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_insert_tag,

+    'update' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_update_tag

+);

+

+__PACKAGE__->tag_syntax(<< 'EOS');

 [tag]                     [expand]

 {? name}                  ?

 {= name}                  name = ?

@@ -41,27 +39,16 @@ sub tag_syntax  : ClassObjectAttr {

 {update key1 key2}    set key1 = ?, key2 = ?

 EOS

-# Tag processors

-sub tag_processors : ClassObjectAttr {

-    type => 'hash',

-    deref => 1,

-    initialize => {

-        clone => 'hash', 

-        default => sub {{

-            '?'             => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '='             => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '<>'            => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '>'             => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '<'             => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '>='            => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            '<='            => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            'like'          => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-            'in'            => \&DBIx::Custom::SQL::Template::TagProcessors::expand_in_tag,

-            'insert'        => \&DBIx::Custom::SQL::Template::TagProcessors::expand_insert_tag,

-            'update'    => \&DBIx::Custom::SQL::Template::TagProcessors::expand_update_tag

-        }}

-    }

-}

+# Accessor is created by Object::Simple.

+

+### Class-Object accessors

+

+

+sub tag_start      : HybridAttr { build => '{', clone => 'scalar' }

+sub tag_end        : HybridAttr { build => '}', clone => 'scalar' }

+sub tag_syntax     : HybridAttr { clone => 'scalar' }

+sub tag_processors : HybridAttr { type  => 'hash', build => sub {{}},

+                                  clone => 'hash', deref => 1 }

 # Add Tag processor

 sub add_tag_processor {

@@ -234,7 +221,7 @@ sub _placeholder_count {

     return $count;

 }

-Object::Simple->build_class;

+1;

 package DBIx::Custom::SQL::Template::TagProcessors;