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
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;
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';
# 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/);
use Class::Unload;
require DBIx::Class;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
__PACKAGE__->mk_ro_accessors(qw/
schema
=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
$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 =
$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};
use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
$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);
+ }
}
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Text::Balanced qw( extract_bracketed );
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
package DBIx::Class::Schema::Loader::DBI::Writing;
use strict;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
# Empty. POD only.
use Carp::Clan qw/^DBIx::Class/;
use Class::C3;
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
=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 {
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 $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, {
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.04999_11';
+our $VERSION = '0.04999_12';
=head1 NAME
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,
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';
},
);
+done_testing;
+
END { rmtree($DUMP_PATH, 1, 1); }
package My::ResultBaseClass;
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
1;
projects / dbsrgits/DBIx-Class-Schema-Loader.git / commitdiff