[Bast-commits] r8194 - in
branches/DBIx-Class-Schema-Loader/current: .
lib/DBIx/Class/Schema lib/DBIx/Class/Schema/Loader
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Wed Dec 30 22:02:44 GMT 2009
Author: caelum
Date: 2009-12-30 22:02:43 +0000 (Wed, 30 Dec 2009)
New Revision: 8194
Modified:
branches/DBIx-Class-Schema-Loader/current/
branches/DBIx-Class-Schema-Loader/current/Makefile.PL
branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm
branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
Log:
r22310 at hlagh (orig r8183): jhannah | 2009-12-29 22:02:03 -0500
Branch to move from Class::Data::Accessor (deprecated) to
Class::Accessor::Grouped.
r22311 at hlagh (orig r8184): jhannah | 2009-12-29 22:34:04 -0500
Suppress 2nd warning below which makes the test fail.
not ok 3 - Expected loader warning
# Failed test 'Expected loader warning'
# at t/lib/dbixcsl_common_tests.pm line 149.
# got: '4'
# expected: '3'
# DBIx::Class::Schema::Loader::connection(): loader_test9 has no primary key at (eval 57)[t/lib/dbixcsl_common_te
# Use of uninitialized value in string ne at lib/DBIx/Class/Schema/Loader/Base.pm line 454.
# Dumping manual schema for DBIXCSL_Test::Schema to directory ./t/_common_dump ...
# Schema dump completed.
r22315 at hlagh (orig r8188): jhannah | 2009-12-30 16:26:46 -0500
removed Class::Data::Accessor (deprecated)
removed Class::Accessor::Fast (can't do everything CAG can)
added Class::Accessor::Grouped
r22318 at hlagh (orig r8191): caelum | 2009-12-30 16:47:55 -0500
use simple group accessors for Loader::Base, remove CDA from Makefile.PL
r22320 at hlagh (orig r8193): caelum | 2009-12-30 17:01:07 -0500
remove dep on CAF, add dep on CAG
Property changes on: branches/DBIx-Class-Schema-Loader/current
___________________________________________________________________
Name: svk:merge
- 46bc3436-8211-0410-8564-d96f7a728040:/local/DBIx-Class-Schema-Loader/branches/common-dump:37173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/back-compat:8172
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/mssql_tweaks:7407
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/odbc-mssql:6439
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:5726
+ 46bc3436-8211-0410-8564-d96f7a728040:/local/DBIx-Class-Schema-Loader/branches/common-dump:37173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/back-compat:8172
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/deprecate_CDA:8193
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/mssql_tweaks:7407
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/odbc-mssql:6439
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:5726
Modified: branches/DBIx-Class-Schema-Loader/current/Makefile.PL
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Makefile.PL 2009-12-30 22:01:07 UTC (rev 8193)
+++ branches/DBIx-Class-Schema-Loader/current/Makefile.PL 2009-12-30 22:02:43 UTC (rev 8194)
@@ -16,8 +16,7 @@
requires 'Lingua::EN::Inflect::Number' => '1.1';
requires 'Text::Balanced' => 0;
requires 'Digest::MD5' => '2.36';
-requires 'Class::Accessor::Fast' => '0.30';
-requires 'Class::Data::Accessor' => '0.03';
+requires 'Class::Accessor::Grouped' => '0.09002';
requires 'Class::C3' => '0.18';
requires 'Class::C3::Componentised' => '1.0005';
requires 'Carp::Clan' => 0;
Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm 2009-12-30 22:01:07 UTC (rev 8193)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm 2009-12-30 22:02:43 UTC (rev 8194)
@@ -2,7 +2,7 @@
use strict;
use warnings;
-use base qw/Class::Accessor::Fast Class::C3::Componentised/;
+use base qw/Class::Accessor::Grouped Class::C3::Componentised/;
use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
use DBIx::Class::Schema::Loader::RelBuilder;
@@ -18,7 +18,7 @@
our $VERSION = '0.04999_12';
-__PACKAGE__->mk_ro_accessors(qw/
+__PACKAGE__->mk_group_ro_accessors('simple', qw/
schema
schema_class
@@ -51,9 +51,10 @@
monikers
dynamic
naming
- /);
+/);
-__PACKAGE__->mk_accessors(qw/
+
+__PACKAGE__->mk_group_accessors('simple', qw/
version_to_dump
schema_version_to_dump
_upgrading_from
@@ -453,7 +454,7 @@
my $fullpath = File::Spec->catfile($prefix, $file);
return $fullpath if -f $fullpath
and Cwd::abs_path($fullpath) ne
- Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '';
+ (Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '');
}
return;
Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm 2009-12-30 22:01:07 UTC (rev 8193)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm 2009-12-30 22:02:43 UTC (rev 8194)
@@ -2,7 +2,7 @@
use strict;
use warnings;
-use base qw/DBIx::Class::Schema Class::Data::Accessor/;
+use base qw/DBIx::Class::Schema Class::Accessor::Grouped/;
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
use Scalar::Util qw/ weaken /;
@@ -12,10 +12,15 @@
# brain damage and presumably various other packaging systems too
our $VERSION = '0.04999_12';
-__PACKAGE__->mk_classaccessor('_loader_args' => {});
-__PACKAGE__->mk_classaccessors(qw/
- dump_to_dir _loader_invoked _loader loader_class naming
+__PACKAGE__->mk_group_accessors('inherited', qw/
+ _loader_args
+ dump_to_dir
+ _loader_invoked
+ _loader
+ loader_class
+ naming
/);
+__PACKAGE__->_loader_args({});
=head1 NAME
@@ -134,7 +139,7 @@
sub loader_options {
my $self = shift;
-
+
my %args = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_;
$self->_loader_args(\%args);
@@ -448,6 +453,8 @@
gugu: Andrey Kostenko <a.kostenko at rambler-co.ru>
+jhannah: Jay Hannah <jay at jays.net>
+
... and lots of other folks. If we forgot you, please write the current
maintainer or RT.
More information about the Bast-commits
mailing list