[Bast-commits] r8162 - in
branches/DBIx-Class-Schema-Loader/back-compat: .
lib/DBIx/Class/Schema lib/DBIx/Class/Schema/Loader
lib/DBIx/Class/Schema/Loader/DBI
lib/DBIx/Class/Schema/Loader/DBI/ODBC
lib/DBIx/Class/Schema/Loader/DBI/Sybase t t/lib/My
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Thu Dec 24 06:50:17 GMT 2009
Author: caelum
Date: 2009-12-24 06:50:16 +0000 (Thu, 24 Dec 2009)
New Revision: 8162
Modified:
branches/DBIx-Class-Schema-Loader/back-compat/
branches/DBIx-Class-Schema-Loader/back-compat/Changes
branches/DBIx-Class-Schema-Loader/back-compat/Makefile.PL
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
branches/DBIx-Class-Schema-Loader/back-compat/t/11mysql_common.t
branches/DBIx-Class-Schema-Loader/back-compat/t/23dumpmore.t
branches/DBIx-Class-Schema-Loader/back-compat/t/lib/My/ResultBaseClass.pm
Log:
r21713 at hlagh (orig r7994): caelum | 2009-11-30 09:06:50 -0500
base results on Core, only load components if there are extra components
r21715 at hlagh (orig r7996): caelum | 2009-11-30 11:35:46 -0500
fix MySQL rel introspection with on_connect_call => "set_strict_mode" (RT#52087)
r21717 at hlagh (orig r7998): caelum | 2009-11-30 18:27:45 -0500
tests pass again
r21718 at hlagh (orig r7999): caelum | 2009-11-30 18:44:28 -0500
new dev release
r21721 at hlagh (orig r8002): caelum | 2009-11-30 20:43:04 -0500
better handling of db_schema for Oracle, based on (RT#35732)
Property changes on: branches/DBIx-Class-Schema-Loader/back-compat
___________________________________________________________________
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/current:7987
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/current:8002
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/back-compat/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/Changes 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/Changes 2009-12-24 06:50:16 UTC (rev 8162)
@@ -1,5 +1,12 @@
Revision history for Perl extension DBIx::Class::Schema::Loader
+ - better handling of db_schema for Oracle, based on (RT#35732)
+
+0.04999_12 2009-11-30 23:36:14
+ - fix MySQL rel introspection with on_connect_call =>
+ 'set_strict_mode' (RT#52087)
+ - now using base 'DBIx::Class::Core' for Results (RT#52141)
+
0.04999_11 2009-11-29 18:08:46
- added patch to generate POD from postgres by Andrey Kostenko (GUGU)
- added test for norewrite feature
Modified: branches/DBIx-Class-Schema-Loader/back-compat/Makefile.PL
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/Makefile.PL 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/Makefile.PL 2009-12-24 06:50:16 UTC (rev 8162)
@@ -3,7 +3,7 @@
name 'DBIx-Class-Schema-Loader';
all_from 'lib/DBIx/Class/Schema/Loader.pm';
-test_requires 'Test::More' => '0.47';
+test_requires 'Test::More' => '0.94';
test_requires 'DBI' => '1.56';
test_requires 'DBD::SQLite' => '1.12';
test_requires 'File::Path' => 0;
@@ -22,7 +22,7 @@
requires 'Class::C3::Componentised' => '1.0005';
requires 'Carp::Clan' => 0;
requires 'Class::Inspector' => 0;
-requires 'DBIx::Class' => '0.08109';
+requires 'DBIx::Class' => '0.08114';
requires 'Class::Unload' => 0;
install_script 'script/dbicdump';
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/Base.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -16,7 +16,7 @@
use Class::Unload;
require DBIx::Class;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
__PACKAGE__->mk_ro_accessors(qw/
schema
@@ -185,7 +185,8 @@
=head2 result_base_class
-Base class for your table classes (aka result classes). Defaults to 'DBIx::Class'.
+Base class for your table classes (aka result classes). Defaults to
+'DBIx::Class::Core'.
=head2 additional_base_classes
@@ -680,7 +681,7 @@
$self->_write_classfile($schema_class, $schema_text);
}
- my $result_base_class = $self->result_base_class || 'DBIx::Class';
+ my $result_base_class = $self->result_base_class || 'DBIx::Class::Core';
foreach my $src_class (@classes) {
my $src_text =
@@ -855,7 +856,9 @@
$self->_use ($table_class, @{$self->additional_classes});
$self->_inject($table_class, @{$self->left_base_classes});
- $self->_dbic_stmt($table_class, 'load_components', @{$self->components}, 'Core');
+ if (my @components = @{ $self->components }) {
+ $self->_dbic_stmt($table_class, 'load_components', @components);
+ }
$self->_dbic_stmt($table_class, 'load_resultset_components', @{$self->resultset_components})
if @{$self->resultset_components};
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
@@ -36,7 +36,14 @@
$self->next::method(@_);
my $dbh = $self->schema->storage->dbh;
- $self->{db_schema} ||= $dbh->selectrow_array('SELECT USER FROM DUAL', {});
+
+ my ($current_schema) = $dbh->selectrow_array('SELECT USER FROM DUAL', {});
+
+ $self->{db_schema} ||= $current_schema;
+
+ if (lc($self->db_schema) ne lc($current_schema)) {
+ $dbh->do('ALTER SESSION SET current_schema=' . $self->db_schema);
+ }
}
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -7,7 +7,7 @@
use Text::Balanced qw( extract_bracketed );
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -5,7 +5,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -1,7 +1,7 @@
package DBIx::Class::Schema::Loader::DBI::Writing;
use strict;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
# Empty. POD only.
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
@@ -27,20 +27,10 @@
=cut
-# had to override here because MySQL apparently
-# doesn't support '%' syntax. Perhaps the other
-# drivers support this syntax also, but I didn't
-# want to risk breaking some esoteric DBD::foo version
-# in a maint release...
sub _tables_list {
my $self = shift;
- my $dbh = $self->schema->storage->dbh;
- my @tables = $dbh->tables(undef, $self->db_schema, undef, undef);
- s/\Q$self->{_quoter}\E//g for @tables;
- s/^.*\Q$self->{_namesep}\E// for @tables;
-
- return @tables;
+ return $self->next::method(undef, undef);
}
sub _table_fk_info {
@@ -50,19 +40,23 @@
my $table_def_ref = $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`")
or croak ("Cannot get table definition for $table");
my $table_def = $table_def_ref->[1] || '';
-
- my (@reldata) = ($table_def =~ /CONSTRAINT `.*` FOREIGN KEY \(`(.*)`\) REFERENCES `(.*)` \(`(.*)`\)/ig);
+ my $qt = qr/["`]/;
+
+ my (@reldata) = ($table_def =~
+ /CONSTRAINT $qt.*$qt FOREIGN KEY \($qt(.*)$qt\) REFERENCES $qt(.*)$qt \($qt(.*)$qt\)/ig
+ );
+
my @rels;
while (scalar @reldata > 0) {
my $cols = shift @reldata;
my $f_table = shift @reldata;
my $f_cols = shift @reldata;
- my @cols = map { s/\Q$self->{_quoter}\E//; lc $_ }
+ my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
split(/\s*,\s*/, $cols);
- my @f_cols = map { s/\Q$self->{_quoter}\E//; lc $_ }
+ my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
split(/\s*,\s*/, $f_cols);
push(@rels, {
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/DBI.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/RelBuilder.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader/RelBuilder.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
Modified: branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/lib/DBIx/Class/Schema/Loader.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -10,7 +10,7 @@
# Always remember to do all digits for the version even if they're 0
# i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
# brain damage and presumably various other packaging systems too
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
__PACKAGE__->mk_classaccessor('_loader_args' => {});
__PACKAGE__->mk_classaccessors(qw/dump_to_dir _loader_invoked _loader loader_class/);
Modified: branches/DBIx-Class-Schema-Loader/back-compat/t/11mysql_common.t
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/t/11mysql_common.t 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/t/11mysql_common.t 2009-12-24 06:50:16 UTC (rev 8162)
@@ -17,6 +17,7 @@
dsn => $dsn,
user => $user,
password => $password,
+ connect_info_opts=> { on_connect_call => 'set_strict_mode' },
skip_rels => $test_innodb ? 0 : $skip_rels_msg,
no_inline_rels => 1,
no_implicit_rels => 1,
Modified: branches/DBIx-Class-Schema-Loader/back-compat/t/23dumpmore.t
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/t/23dumpmore.t 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/t/23dumpmore.t 2009-12-24 06:50:16 UTC (rev 8162)
@@ -6,9 +6,9 @@
use make_dbictest_db;
require DBIx::Class::Schema::Loader;
-$^O eq 'MSWin32'
- ? plan(skip_all => "ActiveState perl produces additional warnings, and this test uses unix paths")
- : plan(tests => 153);
+$^O eq 'MSWin32' && plan(skip_all =>
+"ActiveState perl produces additional warnings, and this test uses unix paths"
+);
my $DUMP_PATH = './t/_dump';
@@ -316,4 +316,6 @@
},
);
+done_testing;
+
END { rmtree($DUMP_PATH, 1, 1); }
Modified: branches/DBIx-Class-Schema-Loader/back-compat/t/lib/My/ResultBaseClass.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/back-compat/t/lib/My/ResultBaseClass.pm 2009-12-24 06:49:54 UTC (rev 8161)
+++ branches/DBIx-Class-Schema-Loader/back-compat/t/lib/My/ResultBaseClass.pm 2009-12-24 06:50:16 UTC (rev 8162)
@@ -1,3 +1,3 @@
package My::ResultBaseClass;
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
1;
More information about the Bast-commits
mailing list