test float(x) type aliases in pg

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / lib / dbixcsl_common_tests.pm

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index b197ff4..8dff6ec 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -148,7 +148,7 @@ sub setup_schema {
          };
  
         ok(!$@, "Loader initialization") or diag $@;
- 
+
         find sub { return if -d; $file_count++ }, $DUMP_DIR;
  
         $expected_count += grep /CREATE (?:TABLE|VIEW)/i,
@@ -172,10 +172,6 @@ sub setup_schema {
  
         $warn_count++ for grep /renaming \S+ relation/, @loader_warnings;
  
-        my $vendor = $self->{vendor};
-        $warn_count++ for grep /${vendor}_\S+ has no primary key/,
-            @loader_warnings;
-
         $warn_count++ for grep /\b(?!loader_test9)\w+ has no primary key/i, @loader_warnings;
 
         if($self->{skip_rels}) {
@@ -1373,7 +1369,7 @@ sub create {
 
     $dbh->do($_) for (@statements);
 
-    $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests};
+    $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests}{ddl};
 
     unless($self->{skip_rels}) {
         # hack for now, since DB2 doesn't like inline comments, and we need
@@ -1547,6 +1543,8 @@ sub setup_data_type_tests {
 
     my $test_count = 0;
 
+    my %seen_col_names;
+
     while (my ($col_def, $expected_info) = each %$types) {
         my $have_size = $col_def =~ /\(/ ? 1 : 0;
 
@@ -1555,6 +1553,8 @@ sub setup_data_type_tests {
 
         my $col_name = $type_alias . ($have_size ? '_with_size' : '');
 
+        $col_name .= $seen_col_names{$col_name} if $seen_col_names{$col_name}++;
+
         $ddl .= "    $col_name $col_def,\n";
 
         $cols->{$col_name} = $expected_info;