X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=1cb1ce29844bf395c8034cdd6957332e9806c745;hb=2b74a06bb8493df6e4bb15a445bd4bfb370d91c6;hp=782d9855ca6ae3813c649d88f8942cbf5967a8b7;hpb=dd87d4c4612dbc0120da1e1826cb3f09c15fbcdb;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index 782d985..1cb1ce2 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -88,7 +88,7 @@ sub run_tests { my $extra_count = $self->{extra}{count} || 0; - plan tests => @connect_info * (178 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); + plan tests => @connect_info * (182 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); foreach my $info_idx (0..$#connect_info) { my $info = $connect_info[$info_idx]; @@ -175,9 +175,16 @@ sub setup_schema { my $debug = ($self->{verbose} > 1) ? 1 : 0; + eval <<'EOF'; +require Moose; +require MooseX::NonMoose; +require namespace::autoclean; +EOF + my $use_moose = $@ ? 0 : 1; + my %loader_opts = ( constraint => - qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)_)?loader_test[0-9]+(?!.*_)/i, + qr/^(?:\S+\.)?(?:(?:$self->{vendor}|extra)_?)?loader_?test[0-9]+(?!.*_)/i, relationships => 1, additional_classes => 'TestAdditional', additional_base_classes => 'TestAdditionalBase', @@ -193,6 +200,7 @@ sub setup_schema { dump_directory => $DUMP_DIR, datetime_timezone => 'Europe/Berlin', datetime_locale => 'de_DE', + use_moose => $use_moose, %{ $self->{loader_options} || {} }, ); @@ -246,6 +254,8 @@ sub setup_schema { $warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings; + $warn_count++ for grep { my $w = $_; grep $w =~ $_, @{ $self->{warnings} || [] } } @loader_warnings; + if ($standard_sources) { if($self->{skip_rels}) { SKIP: { @@ -315,7 +325,7 @@ sub test_schema { isa_ok( $rsobj35, "DBIx::Class::ResultSet" ); my @columns_lt2 = $class2->columns; - is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent/ ], "Column Ordering" ); + is_deeply( \@columns_lt2, [ qw/id dat dat2 set_primary_key dbix_class_testcomponent meta/ ], "Column Ordering" ); is $class2->column_info('set_primary_key')->{accessor}, undef, 'accessor for column name that conflicts with a result base class method removed'; @@ -323,6 +333,9 @@ sub test_schema { is $class2->column_info('dbix_class_testcomponent')->{accessor}, undef, 'accessor for column name that conflicts with a component class method removed'; + is $class2->column_info('meta')->{accessor}, undef, + 'accessor for column name that conflicts with Moose removed'; + my %uniq1 = $class1->unique_constraints; my $uniq1_test = 0; foreach my $ucname (keys %uniq1) { @@ -432,11 +445,21 @@ sub test_schema { 'constant integer default', ); + is( + $class35->column_info('a_negative_int')->{default_value}, -42, + 'constant negative integer default', + ); + cmp_ok( $class35->column_info('a_double')->{default_value}, '==', 10.555, 'constant numeric default', ); + cmp_ok( + $class35->column_info('a_negative_double')->{default_value}, '==', -10.555, + 'constant negative numeric default', + ); + my $function_default = $class35->column_info('a_function')->{default_value}; isa_ok( $function_default, 'SCALAR', 'default_value for function default' ); @@ -633,12 +656,14 @@ sub test_schema { 'might_have does not have is_deferrable'); # find on multi-col pk - my $obj5 = - eval { $rsobj5->find({id1 => 1, iD2 => 1}) } || - eval { $rsobj5->find({id1 => 1, id2 => 1}) }; - die $@ if $@; - - is( (eval { $obj5->id2 } || eval { $obj5->i_d2 }), 1, "Find on multi-col PK" ); + if ($conn->_loader->preserve_case) { + my $obj5 = $rsobj5->find({id1 => 1, iD2 => 1}); + is $obj5->i_d2, 1, 'Find on multi-col PK'; + } + else { + my $obj5 = $rsobj5->find({id1 => 1, id2 => 1}); + is $obj5->id2, 1, 'Find on multi-col PK'; + } # mulit-col fk def my $obj6 = $rsobj6->find(1); @@ -883,7 +908,7 @@ sub test_schema { my $find_cb = sub { return if -d; - return if $_ eq 'LoaderTest30.pm'; + return if /^(?:LoaderTest30|LoaderTest1|LoaderTest2X)\.pm\z/; open my $fh, '<', $_ or die "Could not open $_ for reading: $!"; binmode $fh; @@ -892,7 +917,10 @@ sub test_schema { find $find_cb, $DUMP_DIR; - my $before_digest = $digest->digest; +# system "rm -f /tmp/before_rescan/* /tmp/after_rescan/*"; +# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/before_rescan"; + + my $before_digest = $digest->b64digest; $conn->storage->disconnect; # needed for Firebird and Informix my $dbh = $self->dbconnect(1); @@ -918,9 +946,11 @@ sub test_schema { }; is_deeply(\@new, [ qw/LoaderTest30/ ], "Rescan"); +# system "cp t/_common_dump/DBIXCSL_Test/Schema/*.pm /tmp/after_rescan"; + $digest = Digest::MD5->new; find $find_cb, $DUMP_DIR; - my $after_digest = $digest->digest; + my $after_digest = $digest->b64digest; is $before_digest, $after_digest, 'dumped files are not rewritten when there is no modification'; @@ -957,6 +987,8 @@ sub test_schema { # run extra tests $self->{extra}{run}->($conn, $monikers, $classes) if $self->{extra}{run}; + $self->test_preserve_case($conn); + $self->drop_tables unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}; $conn->storage->disconnect; @@ -998,6 +1030,58 @@ sub test_data_types { } } +sub test_preserve_case { + my ($self, $conn) = @_; + + my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); # open quote, close quote + + my $dbh = $conn->storage->dbh; + + { + # Silence annoying but harmless postgres "NOTICE: CREATE TABLE..." + local $SIG{__WARN__} = sub { + my $msg = shift; + warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE}; + }; + + $dbh->do($_) for ( +qq| + CREATE TABLE ${oqt}LoaderTest40${cqt} ( + ${oqt}Id${cqt} INTEGER NOT NULL PRIMARY KEY, + ${oqt}Foo3Bar${cqt} VARCHAR(100) NOT NULL + ) $self->{innodb} +|, +qq| + CREATE TABLE ${oqt}LoaderTest41${cqt} ( + ${oqt}Id${cqt} INTEGER NOT NULL PRIMARY KEY, + ${oqt}LoaderTest40Id${cqt} INTEGER, + FOREIGN KEY (${oqt}LoaderTest40Id${cqt}) REFERENCES ${oqt}LoaderTest40${cqt} (${oqt}Id${cqt}) + ) $self->{innodb} +|, +qq| INSERT INTO ${oqt}LoaderTest40${cqt} VALUES (1, 'foo') |, +qq| INSERT INTO ${oqt}LoaderTest41${cqt} VALUES (1, 1) |, + ); + } + $conn->storage->disconnect; + + local $conn->_loader->{preserve_case} = 1; + $conn->_loader->_setup; + + { + local $SIG{__WARN__} = sub {}; + $conn->rescan; + } + + if (not $self->{skip_rels}) { + is $conn->resultset('LoaderTest41')->find(1)->loader_test40->foo3_bar, 'foo', + 'rel and accessor for mixed-case column name in mixed case table'; + } + else { + is $conn->resultset('LoaderTest40')->find(1)->foo3_bar, 'foo', + 'accessor for mixed-case column name in mixed case table'; + } +} + sub monikers_and_classes { my ($self, $schema_class) = @_; my ($monikers, $classes); @@ -1058,6 +1142,26 @@ sub dbconnect { return $dbh; } +sub get_oqt_cqt { + my $self = shift; + my %opts = @_; + + if ((not $opts{always}) && $self->{preserve_case_mode_is_exclusive}) { + return ('', ''); + } + + # XXX should get quote_char from the storage of an initialized loader. + my ($oqt, $cqt); # open quote, close quote + if (ref $self->{quote_char}) { + ($oqt, $cqt) = @{ $self->{quote_char} }; + } + else { + $oqt = $cqt = $self->{quote_char} || ''; + } + + return ($oqt, $cqt); +} + sub create { my $self = shift; @@ -1085,6 +1189,7 @@ sub create { dat2 VARCHAR(32) NOT NULL, set_primary_key INTEGER $self->{null}, dbix_class_testcomponent INTEGER $self->{null}, + meta INTEGER $self->{null}, UNIQUE (dat2, dat) ) $self->{innodb} }, @@ -1114,7 +1219,9 @@ sub create { id INTEGER NOT NULL PRIMARY KEY, a_varchar VARCHAR(100) DEFAULT 'foo', an_int INTEGER DEFAULT 42, + a_negative_int INTEGER DEFAULT -42, a_double DOUBLE PRECISION DEFAULT 10.555, + a_negative_double DOUBLE PRECISION DEFAULT -10.555, a_function $self->{default_function_def} ) $self->{innodb} }, @@ -1129,6 +1236,9 @@ sub create { }, ); + # some DBs require mixed case identifiers to be quoted + my ($oqt, $cqt) = $self->get_oqt_cqt; + @statements_reltests = ( qq{ CREATE TABLE loader_test3 ( @@ -1156,33 +1266,33 @@ sub create { q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(125,3,'ccc') }, q{ INSERT INTO loader_test4 (id,fkid,dat) VALUES(126,4,'ddd') }, - qq{ + qq| CREATE TABLE loader_test5 ( id1 INTEGER NOT NULL, - iD2 INTEGER NOT NULL, + ${oqt}iD2${cqt} INTEGER NOT NULL, dat VARCHAR(8), from_id INTEGER $self->{null}, to_id INTEGER $self->{null}, - PRIMARY KEY (id1,iD2), + PRIMARY KEY (id1,${oqt}iD2${cqt}), FOREIGN KEY (from_id) REFERENCES loader_test4 (id), FOREIGN KEY (to_id) REFERENCES loader_test4 (id) ) $self->{innodb} - }, + |, - q{ INSERT INTO loader_test5 (id1,iD2,dat) VALUES (1,1,'aaa') }, + qq| INSERT INTO loader_test5 (id1,${oqt}iD2${cqt},dat) VALUES (1,1,'aaa') |, - qq{ + qq| CREATE TABLE loader_test6 ( id INTEGER NOT NULL PRIMARY KEY, - Id2 INTEGER, + ${oqt}Id2${cqt} INTEGER, loader_test2_id INTEGER, dat VARCHAR(8), FOREIGN KEY (loader_test2_id) REFERENCES loader_test2 (id), - FOREIGN KEY(id,Id2) REFERENCES loader_test5 (id1,iD2) + FOREIGN KEY(id,${oqt}Id2${cqt}) REFERENCES loader_test5 (id1,${oqt}iD2${cqt}) ) $self->{innodb} - }, + |, - (q{ INSERT INTO loader_test6 (id, Id2,loader_test2_id,dat) } . + (qq| INSERT INTO loader_test6 (id, ${oqt}Id2${cqt},loader_test2_id,dat) | . q{ VALUES (1, 1,1,'aaa') }), qq{ @@ -1505,7 +1615,7 @@ sub create { $dbh->do($_) foreach (@statements); - $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || {} }); + $dbh->do($_) foreach (@{ $self->{data_type_tests}{ddl} || [] }); unless($self->{skip_rels}) { # hack for now, since DB2 doesn't like inline comments, and we need @@ -1595,6 +1705,8 @@ sub drop_tables { my @tables_rescan = qw/ loader_test30 /; + my @tables_preserve_case_tests = qw/ LoaderTest41 LoaderTest40 /; + my $drop_fk_mysql = q{ALTER TABLE loader_test10 DROP FOREIGN KEY loader_test11_fk}; @@ -1610,6 +1722,7 @@ sub drop_tables { unless($self->{skip_rels}) { $dbh->do("DROP TABLE $_") for (@tables_reltests); + $dbh->do("DROP TABLE $_") for (@tables_reltests); if($self->{vendor} =~ /mysql/i) { $dbh->do($drop_fk_mysql); } @@ -1629,10 +1742,14 @@ sub drop_tables { $dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc; $dbh->do("DROP TABLE $_") for (@tables, @tables_rescan); - foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || {} }) { + foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) { $dbh->do("DROP TABLE $data_type_table"); } + my ($oqt, $cqt) = $self->get_oqt_cqt(always => 1); + + $dbh->do("DROP TABLE ${oqt}${_}${cqt}") for @tables_preserve_case_tests; + $dbh->disconnect; # fixup for Firebird @@ -1665,8 +1782,9 @@ sub _custom_column_info { } my %DATA_TYPE_MULTI_TABLE_OVERRIDES = ( - oracle => qr/\blong\b/, - mssql => qr/\b(?:timestamp|rowversion)\b/, + oracle => qr/\blong\b/i, + mssql => qr/\b(?:timestamp|rowversion)\b/i, + informix => qr/\b(?:bigserial|serial8)\b/i, ); sub setup_data_type_tests { @@ -1679,11 +1797,11 @@ sub setup_data_type_tests { # split types into tables based on overrides my (@types, @split_off_types, @first_table_types); { - no warnings 'uninitialized'; + my $split_off_re = $DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})} || qr/(?!)/; @types = keys %$types; - @split_off_types = grep /$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types; - @first_table_types = grep !/$DATA_TYPE_MULTI_TABLE_OVERRIDES{lc($self->{vendor})}/i, @types; + @split_off_types = grep /$split_off_re/, @types; + @first_table_types = grep !/$split_off_re/, @types; } @types = +{ map +($_, $types->{$_}), @first_table_types },