cleanup ・ f3fe7ae ・ Gitprep

- cleanup;
- Browse files
- yuki-kimoto commited on 2010-01-21
- 1 parent 2566903
  
  commit f3fe7ae7821cf49a6e2f4db6d42ff4f5b63a8968

Showing 4 changed files with 17 additions and 17 deletions

+1 -1

Build.PL

...	...	@@ -11,7 +11,7 @@ my $builder = Module::Build->new(
11	11	'Test::More' => 0,
12	12	},
13	13	requires => {
14		- 'Object::Simple' => 2.1301,
	14	+ 'Object::Simple' => 3.0101,
15	15	'DBI' => 1.605,
16	16	'DBD::SQLite' => 1.25,
17	17	'Time::Piece' => 1.15

Changes

View

...	...	@@ -1,3 +1,5 @@
	1	+0.0904
	2	+ cleanup
1	3	0.0903
2	4	catch up with Object::Simple update
3	5	0.0902

+10 -12

lib/DBIx/Custom.pm

View

@@ -4,8 +4,6 @@ use base 'Object::Simple::Base';
 use strict;
 use warnings;
 
-use 5.008001;
-
 use Carp 'croak';
 use DBI;
 use DBIx::Custom::Result;
@@ -15,23 +13,23 @@ __PACKAGE__->attr('dbh');
 
 __PACKAGE__->class_attr(_query_caches     => sub { {} });
 __PACKAGE__->class_attr(_query_cache_keys => sub { [] });
-__PACKAGE__->class_attr('query_cache_max', default => 50, clone => 'scalar');
+__PACKAGE__->class_attr('query_cache_max', default => 50, inherit => 'scalar');
 
-__PACKAGE__->dual_attr([qw/user password data_source/], clone => 'scalar');
-__PACKAGE__->dual_attr([qw/database host port/],        clone => 'scalar');
-__PACKAGE__->dual_attr([qw/bind_filter fetch_filter/],  clone => 'scalar');
+__PACKAGE__->dual_attr([qw/user password data_source/], inherit => 'scalar');
+__PACKAGE__->dual_attr([qw/database host port/],        inherit => 'scalar');
+__PACKAGE__->dual_attr([qw/bind_filter fetch_filter/],  inherit => 'scalar');
 
 __PACKAGE__->dual_attr([qw/no_bind_filters no_fetch_filters/],
-                       default => sub { [] }, clone => 'array');
+                       default => sub { [] }, inherit => 'array');
 
 __PACKAGE__->dual_attr([qw/options filters formats/],
-                       default => sub { {} }, clone => 'hash');
+                       default => sub { {} }, inherit => 'hash');
 
 __PACKAGE__->dual_attr('result_class', default => 'DBIx::Custom::Result',
-                                       clone   => 'scalar');
+                                       inherit   => 'scalar');
 
 __PACKAGE__->dual_attr('sql_tmpl', default => sub {DBIx::Custom::SQL::Template->new},
-                                   clone   => sub {$_[0] ? $_[0]->clone : undef});
+                                   inherit   => sub {$_[0] ? $_[0]->clone : undef});
 
 sub add_filter {
     my $invocant = shift;
@@ -726,11 +724,11 @@ DBIx::Custom - Customizable DBI
 
 =head1 VERSION
 
-Version 0.0903
+Version 0.0904
 
 =cut
 
-our $VERSION = '0.0903';
+our $VERSION = '0.0904';
 
 =head1 SYNOPSYS
     

+4 -4

lib/DBIx/Custom/SQL/Template.pm

View

@@ -8,12 +8,12 @@ use Carp 'croak';
 use DBIx::Custom::Query;
 
 __PACKAGE__->dual_attr('tag_processors', default => sub { {} },
-                                         clone   => 'hash');
+                                         inherit   => 'hash');
 
-__PACKAGE__->dual_attr('tag_start', default => '{', clone => 'scalar');
-__PACKAGE__->dual_attr('tag_end',   default => '}', clone => 'scalar');
+__PACKAGE__->dual_attr('tag_start', default => '{', inherit => 'scalar');
+__PACKAGE__->dual_attr('tag_end',   default => '}', inherit => 'scalar');
 
-__PACKAGE__->dual_attr('tag_syntax', clone => 'scalar');
+__PACKAGE__->dual_attr('tag_syntax', inherit => 'scalar');
 
 __PACKAGE__->add_tag_processor(
     '?'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

...	...	@@ -4,8 +4,6 @@ use base 'Object::Simple::Base';
4	4	use strict;
5	5	use warnings;
6	6
7		-use 5.008001;
8		-
9	7	use Carp 'croak';
10	8	use DBI;
11	9	use DBIx::Custom::Result;
...	...	@@ -15,23 +13,23 @@ __PACKAGE__->attr('dbh');
15	13
16	14	__PACKAGE__->class_attr(_query_caches => sub { {} });
17	15	__PACKAGE__->class_attr(_query_cache_keys => sub { [] });
18		-__PACKAGE__->class_attr('query_cache_max', default => 50, clone => 'scalar');
	16	+__PACKAGE__->class_attr('query_cache_max', default => 50, inherit => 'scalar');
19	17
20		-__PACKAGE__->dual_attr([qw/user password data_source/], clone => 'scalar');
21		-__PACKAGE__->dual_attr([qw/database host port/], clone => 'scalar');
22		-__PACKAGE__->dual_attr([qw/bind_filter fetch_filter/], clone => 'scalar');
	18	+__PACKAGE__->dual_attr([qw/user password data_source/], inherit => 'scalar');
	19	+__PACKAGE__->dual_attr([qw/database host port/], inherit => 'scalar');
	20	+__PACKAGE__->dual_attr([qw/bind_filter fetch_filter/], inherit => 'scalar');
23	21
24	22	__PACKAGE__->dual_attr([qw/no_bind_filters no_fetch_filters/],
25		- default => sub { [] }, clone => 'array');
	23	+ default => sub { [] }, inherit => 'array');
26	24
27	25	__PACKAGE__->dual_attr([qw/options filters formats/],
28		- default => sub { {} }, clone => 'hash');
	26	+ default => sub { {} }, inherit => 'hash');
29	27
30	28	__PACKAGE__->dual_attr('result_class', default => 'DBIx::Custom::Result',
31		- clone => 'scalar');
	29	+ inherit => 'scalar');
32	30
33	31	__PACKAGE__->dual_attr('sql_tmpl', default => sub {DBIx::Custom::SQL::Template->new},
34		- clone => sub {$_[0] ? $_[0]->clone : undef});
	32	+ inherit => sub {$_[0] ? $_[0]->clone : undef});
35	33
36	34	sub add_filter {
37	35	my $invocant = shift;
...	...	@@ -726,11 +724,11 @@ DBIx::Custom - Customizable DBI
726	724
727	725	=head1 VERSION
728	726
729		-Version 0.0903
	727	+Version 0.0904
730	728
731	729	=cut
732	730
733		-our $VERSION = '0.0903';
	731	+our $VERSION = '0.0904';
734	732
735	733	=head1 SYNOPSYS
736	734

...	...	@@ -8,12 +8,12 @@ use Carp 'croak';
8	8	use DBIx::Custom::Query;
9	9
10	10	__PACKAGE__->dual_attr('tag_processors', default => sub { {} },
11		- clone => 'hash');
	11	+ inherit => 'hash');
12	12
13		-__PACKAGE__->dual_attr('tag_start', default => '{', clone => 'scalar');
14		-__PACKAGE__->dual_attr('tag_end', default => '}', clone => 'scalar');
	13	+__PACKAGE__->dual_attr('tag_start', default => '{', inherit => 'scalar');
	14	+__PACKAGE__->dual_attr('tag_end', default => '}', inherit => 'scalar');
15	15
16		-__PACKAGE__->dual_attr('tag_syntax', clone => 'scalar');
	16	+__PACKAGE__->dual_attr('tag_syntax', inherit => 'scalar');
17	17
18	18	__PACKAGE__->add_tag_processor(
19	19	'?' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,