Test fixup from previous merge:

[dbsrgits/DBIx-Class-Historic.git] / t / run / 12pg.tl

diff --git a/t/run/12pg.tl b/t/run/12pg.tl
index c39dab5..ee3e819 100644 (file)
--- a/t/run/12pg.tl
+++ b/t/run/12pg.tl
@@ -8,15 +8,15 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
 plan skip_all, 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
   . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
 
-plan tests => 3;
+plan tests => 4;
 
 DBICTest::Schema->compose_connection('PgTest' => $dsn, $user, $pass);
 
 my $dbh = PgTest->schema->storage->dbh;
 
-$dbh->do("CREATE TABLE artist (artistid serial PRIMARY KEY, name VARCHAR(255));");
+$dbh->do("CREATE TABLE artist (artistid serial PRIMARY KEY, name VARCHAR(255), charfield CHAR(10));");
 
-PgTest::Artist->load_components('PK::Auto::Pg');
+PgTest::Artist->load_components('PK::Auto');
 
 my $new = PgTest::Artist->create({ name => 'foo' });
 
@@ -28,19 +28,32 @@ is($new->artistid, 2, "Auto-PK worked");
 
 my $test_type_info = {
     'artistid' => {
-        'data_type' => 'int4',
-        'is_nullable' => 1,
-        'size' => 10
+        'data_type' => 'integer',
+        'is_nullable' => 0,
+        'size' => 4,
     },
     'name' => {
-        'data_type' => 'text',
+        'data_type' => 'character varying',
+        'is_nullable' => 1,
+        'size' => 255,
+        'default_value' => undef,
+    },
+    'charfield' => {
+        'data_type' => 'character',
         'is_nullable' => 1,
-        'size' => 4096
-    }
+        'size' => 10,
+        'default_value' => undef,
+    },
 };
 
+
 my $type_info = PgTest->schema->storage->columns_info_for('artist');
-is_deeply($type_info, $test_type_info, 'columns_info_for - column data types');
+my $artistid_defval = delete $type_info->{artistid}->{default_value};
+like($artistid_defval,
+     qr/^nextval\('public\.artist_artistid_seq'::(?:text|regclass)\)/,
+     'columns_info_for - sequence matches Pg get_autoinc_seq expectations');
+is_deeply($type_info, $test_type_info,
+          'columns_info_for - column data types');
 
 $dbh->do("DROP TABLE artist;");