$self->{date_datatype} ||= 'DATE';
# Not all DBS do SQL-standard CURRENT_TIMESTAMP
- $self->{default_function} ||= "CURRENT_TIMESTAMP";
- $self->{default_function_def} ||= "TIMESTAMP DEFAULT $self->{default_function}";
+ $self->{default_function} ||= "current_timestamp";
+ $self->{default_function_def} ||= "timestamp default $self->{default_function}";
$self = bless $self, $class;
plan tests => @$connect_info * (4 + ($self->{extra}{count} || 0) + ($self->{data_type_tests}{test_count} || 0));
+ rmtree $DUMP_DIR;
+
foreach my $info_idx (0..$#$connect_info) {
my $info = $connect_info->[$info_idx];
$dbh->do($_) for @{ $self->{extra}{create} || [] };
- $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests}{ddl};
+ $dbh->do($_) for @{ $self->{data_type_tests}{ddl} || []};
}
$self->{_created} = 1;
my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] };
$file_count++; # schema
- $file_count++ if $self->{data_type_tests}{ddl};
+ $file_count++ for @{ $self->{data_type_tests}{table_names} || [] };
my $schema_class = $self->setup_schema($info, $file_count);
my ($monikers, $classes) = $self->monikers_and_classes($schema_class);
$dbh->do($_) for @{ $self->{extra}{pre_drop_ddl} || [] };
$dbh->do("DROP TABLE $_") for @{ $self->{extra}{drop} || [] };
- if (my $data_type_table = $self->{data_type_tests}{table_name}) {
+ foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || [] }) {
$dbh->do("DROP TABLE $data_type_table");
}
}
my $standard_sources = not defined $expected_count;
if ($standard_sources) {
- $expected_count = 36 + ($self->{data_type_tests}{test_count} ? 1 : 0);
+ $expected_count = 36;
+ $expected_count++ for @{ $self->{data_type_tests}{table_names} || [] };
$expected_count += grep /CREATE (?:TABLE|VIEW)/i,
@{ $self->{extra}{create} || [] };
is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{on_update}, 'CASCADE',
"on_update => 'CASCADE' on belongs_to by default";
- is $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}, 1,
- "is_deferrable => 1 on belongs_to by default";
+ ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{is_deferrable}),
+ "is_deferrable => 1 not on belongs_to by default");
ok ((not exists $rsobj4->result_source->relationship_info('fkid_singular')->{attrs}{cascade_delete}),
'belongs_to does not have cascade_delete');
eval { $rsobj5->find({id1 => 1, id2 => 1}) };
die $@ if $@;
- is( $obj5->id2, 1, "Find on multi-col PK" );
+ is( (eval { $obj5->id2 } || eval { $obj5->i_d2 }), 1, "Find on multi-col PK" );
# mulit-col fk def
my $obj6 = $rsobj6->find(1);
if ($self->{data_type_tests}{test_count}) {
my $data_type_tests = $self->{data_type_tests};
- my $columns = $data_type_tests->{columns};
- my $rsrc = $conn->resultset($data_type_tests->{table_moniker})->result_source;
+ foreach my $moniker (@{ $data_type_tests->{table_monikers} }) {
+ my $columns = $data_type_tests->{columns}{$moniker};
- while (my ($col_name, $expected_info) = each %$columns) {
- my %info = %{ $rsrc->column_info($col_name) };
- delete @info{qw/is_nullable timezone locale sequence/};
+ my $rsrc = $conn->resultset($moniker)->result_source;
- my $text_col_def = do {
- my $dd = Dumper;
- $dd->Indent(0);
- $dd->Values([\%info]);
- $dd->Dump;
- };
+ while (my ($col_name, $expected_info) = each %$columns) {
+ my %info = %{ $rsrc->column_info($col_name) };
+ delete @info{qw/is_nullable timezone locale sequence/};
- my $text_expected_info = do {
- my $dd = Dumper;
- $dd->Indent(0);
- $dd->Values([$expected_info]);
- $dd->Dump;
- };
+ my $text_col_def = do {
+ my $dd = Dumper;
+ $dd->Indent(0);
+ $dd->Values([\%info]);
+ $dd->Dump;
+ };
- is_deeply \%info, $expected_info,
- "test column $col_name has definition: $text_col_def expecting: $text_expected_info";
+ my $text_expected_info = do {
+ my $dd = Dumper;
+ $dd->Indent(0);
+ $dd->Values([$expected_info]);
+ $dd->Dump;
+ };
+
+ is_deeply \%info, $expected_info,
+ "test column $col_name has definition: $text_col_def expecting: $text_expected_info";
+ }
}
}
}
warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
};
- $dbh->do($_) for (@statements);
+ $dbh->do($_) foreach (@statements);
- $dbh->do($self->{data_type_tests}{ddl}) if $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
$dbh->do($_) for map { $drop_auto_inc->(@$_) } @tables_auto_inc;
$dbh->do("DROP TABLE $_") for (@tables, @tables_rescan);
- if (my $data_type_table = $self->{data_type_tests}{table_name}) {
+ foreach my $data_type_table (@{ $self->{data_type_tests}{table_names} || {} }) {
$dbh->do("DROP TABLE $data_type_table");
}
return;
}
+my %DATA_TYPE_MULTI_TABLE_OVERRIDES = (
+ oracle => qr/\blong\b/,
+ mssql => qr/\b(?:timestamp|rowversion)\b/,
+);
+
sub setup_data_type_tests {
my $self = shift;
return unless my $types = $self->{data_types};
my $tests = $self->{data_type_tests} = {};
- my $cols = $tests->{columns} = {};
- $tests->{table_name} = 'loader_test9999';
- $tests->{table_moniker} = 'LoaderTest9999';
+ # split types into tables based on overrides
+ my (@types, @split_off_types, @first_table_types);
+ {
+ no warnings 'uninitialized';
+
+ @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;
+ }
- my $ddl = "CREATE TABLE loader_test9999 (\n id INTEGER NOT NULL PRIMARY KEY,\n";
+ @types = +{ map +($_, $types->{$_}), @first_table_types },
+ map +{ $_, $types->{$_} }, @split_off_types;
my $test_count = 0;
+ my $table_num = 10000;
- my %seen_col_names;
+ foreach my $types (@types) {
+ my $table_name = "loader_test$table_num";
+ push @{ $tests->{table_names} }, $table_name;
- while (my ($col_def, $expected_info) = each %$types) {
- (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg;
+ my $table_moniker = "LoaderTest$table_num";
+ push @{ $tests->{table_monikers} }, $table_moniker;
- my $size = $1;
- $size = '' unless defined $size;
- $size =~ s/\s+//g;
- my @size = split /,/, $size;
+ $table_num++;
- # some DBs don't like very long column names
- if ($self->{vendor} =~ /^firebird|sqlanywhere\z/i) {
- my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
+ my $cols = $tests->{columns}{$table_moniker} = {};
- $type_alias = substr $col_def, 0, 15;
+ my $ddl = "CREATE TABLE $table_name (\n id INTEGER NOT NULL PRIMARY KEY,\n";
- $type_alias .= '_with_dflt' if $default;
- }
+ my %seen_col_names;
- $type_alias =~ s/\s/_/g;
- $type_alias =~ s/\W//g;
+ while (my ($col_def, $expected_info) = each %$types) {
+ (my $type_alias = $col_def) =~ s/\( ([^)]+) \)//xg;
- my $col_name = 'col_' . $type_alias;
-
- if (@size) {
- my $size_name = join '_', apply { s/\W//g } @size;
+ my $size = $1;
+ $size = '' unless defined $size;
+ $size =~ s/\s+//g;
+ my @size = split /,/, $size;
- $col_name .= "_sz_$size_name";
- }
+ # some DBs don't like very long column names
+ if ($self->{vendor} =~ /^(?:firebird|sqlanywhere|oracle)\z/i) {
+ my ($col_def, $default) = $type_alias =~ /^(.*)(default.*)?\z/i;
- # XXX would be better to check _loader->preserve_case
- $col_name = lc $col_name;
+ $type_alias = substr $col_def, 0, 15;
- $col_name .= '_' . $seen_col_names{$col_name} if $seen_col_names{$col_name}++;
+ $type_alias .= '_with_dflt' if $default;
+ }
- $ddl .= " $col_name $col_def,\n";
+ $type_alias =~ s/\s/_/g;
+ $type_alias =~ s/\W//g;
- $cols->{$col_name} = $expected_info;
+ my $col_name = 'col_' . $type_alias;
+
+ if (@size) {
+ my $size_name = join '_', apply { s/\W//g } @size;
- $test_count++;
- }
+ $col_name .= "_sz_$size_name";
+ }
+
+ # XXX would be better to check _loader->preserve_case
+ $col_name = lc $col_name;
+
+ $col_name .= '_' . $seen_col_names{$col_name} if $seen_col_names{$col_name}++;
+
+ $ddl .= " $col_name $col_def,\n";
- $ddl =~ s/,\n\z/\n)/;
+ $cols->{$col_name} = $expected_info;
+
+ $test_count++;
+ }
+
+ $ddl =~ s/,\n\z/\n)/;
+
+ push @{ $tests->{ddl} }, $ddl;
+ }
- $tests->{ddl} = $ddl;
$tests->{test_count} = $test_count;
return $test_count;
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff