X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fdbixcsl_common_tests.pm;h=ae299b9eed89722ddbc30b32f87d2a5a0e099fa6;hb=c7e6dc1fd51af6feea5b585a691a80f904fb4d11;hp=62a4f6861bed161f882e7a2580253714ea82ba06;hpb=b511f36e7550cfe8aac546be689c8bd320a83975;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index 62a4f68..ae299b9 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 * (179 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); + plan tests => @connect_info * (181 + $extra_count + ($self->{data_type_tests}{test_count} || 0)); foreach my $info_idx (0..$#connect_info) { my $info = $connect_info[$info_idx]; @@ -434,11 +434,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' ); @@ -899,7 +909,7 @@ sub test_schema { # 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->digest; + my $before_digest = $digest->b64digest; $conn->storage->disconnect; # needed for Firebird and Informix my $dbh = $self->dbconnect(1); @@ -929,7 +939,7 @@ sub test_schema { $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'; @@ -1197,7 +1207,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} }, @@ -1758,8 +1770,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 { @@ -1772,11 +1785,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 },