more work on pg tests
[dbsrgits/DBIx-Class.git] / t / 72pg.t
index 412cf32..5e6c467 100644 (file)
--- a/t/72pg.t
+++ b/t/72pg.t
@@ -14,8 +14,8 @@ Set \$ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test
 ( NOTE: This test drops and creates tables called 'artist', 'casecheck',
   'array_test' and 'sequence_test' as well as following sequences:
   'pkid1_seq', 'pkid2_seq' and 'nonpkid_seq''.  as well as following
-  schemas: 'testschema', 'anothertestschema', 'yetanothertestschema',
-  'unq_nextval_schema', and 'unq_nextval_schema2'
+  schemas: 'dbic_t_schema', 'dbic_t_schema_2', 'dbic_t_schema_3',
+  'dbic_t_schema_4', and 'dbic_t_schema_5'
 )
 EOM
 
@@ -51,97 +51,17 @@ DBICTest::Schema->load_classes( map {s/.+:://;$_} @test_classes ) if @test_class
 ### connect, create postgres-specific test schema
 
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
-my $dbh = $schema->storage->dbh;
 
 drop_test_schema($schema, 'no warn');
 create_test_schema($schema);
 
 ### begin main tests
 
-###  auto-pk / last_insert_id / sequence discovery
-{
-    $schema->source("Artist")->name("testschema.artist");
-
-    # This is in Core now, but it's here just to test that it doesn't break
-    $schema->class('Artist')->load_components('PK::Auto');
-    cmp_ok( $schema->resultset('Artist')->count, '==', 0, 'this should start with an empty artist table');
-
-    # test that auto-pk also works with the defined search path by
-    # un-schema-qualifying the table name
-    my $artist_name_save = $schema->source("Artist")->name;
-    $schema->source("Artist")->name("artist");
-
-    my $unq_new;
-    lives_ok {
-        $unq_new = $schema->resultset('Artist')->create({ name => 'baz' });
-    } 'insert into unqualified, shadowed table succeeds';
-
-    is($unq_new && $unq_new->artistid, 1, "and got correct artistid");
-
-    my @test_schemas = ( [qw| anothertestschema    1      |],
-                         [qw| yetanothertestschema 1      |],
-                       );
-    foreach my $t ( @test_schemas ) {
-        my ($sch_name, $start_num) = @$t;
-        #test with anothertestschema
-        $schema->source('Artist')->name("$sch_name.artist");
-        $schema->source('Artist')->column_info('artistid')->{sequence} = undef; #< clear sequence name cache
-        my $another_new;
-        lives_ok {
-            $another_new = $schema->resultset('Artist')->create({ name => 'Tollbooth Willy'});
-            is( $another_new->artistid,$start_num, "got correct artistid for $sch_name")
-                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-        } "$sch_name liid 1 did not die"
-            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-        lives_ok {
-            $another_new = $schema->resultset('Artist')->create({ name => 'Adam Sandler'});
-            is( $another_new->artistid,$start_num+1, "got correct artistid for $sch_name")
-                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-        } "$sch_name liid 2 did not die"
-            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-
-    }
-
-
-    my @todo_schemas = (
-                        [qw| unq_nextval_schema   2 |],
-                        [qw| unq_nextval_schema2  1 |],
-                       );
-
-    foreach my $t ( @todo_schemas ) {
-        my ($sch_name, $start_num) = @$t;
-
-        #test with anothertestschema
-        $schema->source('Artist')->name("$sch_name.artist");
-        $schema->source('Artist')->column_info('artistid')->{sequence} = undef; #< clear sequence name cache
-        my $another_new;
-        lives_ok {
-            $another_new = $schema->resultset('Artist')->create({ name => 'Tollbooth Willy'});
-            is( $another_new->artistid,$start_num, "got correct artistid for $sch_name")
-                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-        } "$sch_name liid 1 did not die"
-            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-
-        lives_ok {
-            $another_new = $schema->resultset('Artist')->create({ name => 'Adam Sandler'});
-            is( $another_new->artistid,$start_num+1, "got correct artistid for $sch_name")
-                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-        } "$sch_name liid 2 did not die"
-            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
-    }
-
-    $schema->source('Artist')->column_info('artistid')->{sequence} = undef; #< clear sequence name cache
-    $schema->source("Artist")->name($artist_name_save);
-}
-
-lives_ok {
-    my $new = $schema->resultset('Artist')->create({ name => 'foo' });
-    is($new->artistid, 4, "Auto-PK worked");
-    $new = $schema->resultset('Artist')->create({ name => 'bar' });
-    is($new->artistid, 5, "Auto-PK worked");
-} 'old auto-pk tests did not die either';
-
 
+# run a BIG bunch of tests for last-insert-id / Auto-PK / sequence
+# discovery
+run_apk_tests($schema); #< older set of auto-pk tests
+run_extended_apk_tests($schema); #< new extended set of auto-pk tests
 
 ### type_info tests
 
@@ -178,7 +98,7 @@ my $test_type_info = {
     },
 };
 
-my $type_info = $schema->storage->columns_info_for('testschema.artist');
+my $type_info = $schema->storage->columns_info_for('dbic_t_schema.artist');
 my $artistid_defval = delete $type_info->{artistid}->{default_value};
 like($artistid_defval,
      qr/^nextval\('([^\.]*\.){0,1}artist_artistid_seq'::(?:text|regclass)\)/,
@@ -200,7 +120,7 @@ BEGIN {
   use base 'DBIx::Class';
 
   __PACKAGE__->load_components(qw/Core/);
-  __PACKAGE__->table('testschema.array_test');
+  __PACKAGE__->table('dbic_t_schema.array_test');
   __PACKAGE__->add_columns(qw/id arrayfield/);
   __PACKAGE__->column_info_from_storage(1);
   __PACKAGE__->set_primary_key('id');
@@ -247,7 +167,7 @@ BEGIN {
   use base 'DBIx::Class';
 
   __PACKAGE__->load_components(qw/Core/);
-  __PACKAGE__->table('testschema.casecheck');
+  __PACKAGE__->table('dbic_t_schema.casecheck');
   __PACKAGE__->add_columns(qw/id name NAME uc_name storecolumn/);
   __PACKAGE__->column_info_from_storage(1);
   __PACKAGE__->set_primary_key('id');
@@ -285,7 +205,7 @@ SKIP: {
     skip "Sys::SigAction is not available", 3 unless $HaveSysSigAction;
     # create a new schema
     my $schema2 = DBICTest::Schema->connect($dsn, $user, $pass);
-    $schema2->source("Artist")->name("testschema.artist");
+    $schema2->source("Artist")->name("dbic_t_schema.artist");
 
     $schema->txn_do( sub {
         my $artist = $schema->resultset('Artist')->search(
@@ -322,7 +242,7 @@ SKIP: {
     skip "Sys::SigAction is not available", 3 unless $HaveSysSigAction;
     # create a new schema
     my $schema2 = DBICTest::Schema->connect($dsn, $user, $pass);
-    $schema2->source("Artist")->name("testschema.artist");
+    $schema2->source("Artist")->name("dbic_t_schema.artist");
 
     $schema->txn_do( sub {
         my $artist = $schema->resultset('Artist')->search(
@@ -353,9 +273,9 @@ SKIP: {
 }
 
 
-######## other Auto-pk tests
+######## other older Auto-pk tests
 
-$schema->source("SequenceTest")->name("testschema.sequence_test");
+$schema->source("SequenceTest")->name("dbic_t_schema.sequence_test");
 for (1..5) {
     my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' });
     is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key");
@@ -368,7 +288,11 @@ is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manual
 done_testing;
 
 exit;
-END { drop_test_schema($schema) }
+
+END {
+    drop_test_schema($schema);
+    eapk_drop_all( $schema)
+};
 
 
 ######### SUBROUTINES
@@ -390,10 +314,10 @@ sub create_test_schema {
 )
 EOS
 
-      $dbh->do("CREATE SCHEMA testschema");
-      $dbh->do("CREATE TABLE testschema.artist $std_artist_table");
+      $dbh->do("CREATE SCHEMA dbic_t_schema");
+      $dbh->do("CREATE TABLE dbic_t_schema.artist $std_artist_table");
       $dbh->do(<<EOS);
-CREATE TABLE testschema.sequence_test (
+CREATE TABLE dbic_t_schema.sequence_test (
     pkid1 integer
     , pkid2 integer
     , nonpkid integer
@@ -405,7 +329,7 @@ EOS
       $dbh->do("CREATE SEQUENCE pkid2_seq START 10 MAXVALUE 999999 MINVALUE 0");
       $dbh->do("CREATE SEQUENCE nonpkid_seq START 20 MAXVALUE 999999 MINVALUE 0");
       $dbh->do(<<EOS);
-CREATE TABLE testschema.casecheck (
+CREATE TABLE dbic_t_schema.casecheck (
     id serial PRIMARY KEY
     , "name" VARCHAR(1)
     , "NAME" VARCHAR(2)
@@ -414,20 +338,20 @@ CREATE TABLE testschema.casecheck (
 )
 EOS
       $dbh->do(<<EOS);
-CREATE TABLE testschema.array_test (
+CREATE TABLE dbic_t_schema.array_test (
     id serial PRIMARY KEY
     , arrayfield INTEGER[]
 )
 EOS
-      $dbh->do("CREATE SCHEMA anothertestschema");
-      $dbh->do("CREATE TABLE anothertestschema.artist $std_artist_table");
-      $dbh->do("CREATE SCHEMA yetanothertestschema");
-      $dbh->do("CREATE TABLE yetanothertestschema.artist $std_artist_table");
-      $dbh->do('set search_path=testschema,public');
-      $dbh->do("CREATE SCHEMA unq_nextval_schema");
-      $dbh->do("CREATE SCHEMA unq_nextval_schema2");
+      $dbh->do("CREATE SCHEMA dbic_t_schema_2");
+      $dbh->do("CREATE TABLE dbic_t_schema_2.artist $std_artist_table");
+      $dbh->do("CREATE SCHEMA dbic_t_schema_3");
+      $dbh->do("CREATE TABLE dbic_t_schema_3.artist $std_artist_table");
+      $dbh->do('set search_path=dbic_t_schema,public');
+      $dbh->do("CREATE SCHEMA dbic_t_schema_4");
+      $dbh->do("CREATE SCHEMA dbic_t_schema_5");
       $dbh->do(<<EOS);
- CREATE TABLE unq_nextval_schema.artist
+ CREATE TABLE dbic_t_schema_4.artist
  (
    artistid integer not null default nextval('artist_artistid_seq'::regclass) PRIMARY KEY
    , name VARCHAR(100)
@@ -436,10 +360,10 @@ EOS
    , arrayfield INTEGER[]
  );
 EOS
-      $dbh->do('set search_path=public,testschema,yetanothertestschema');
+      $dbh->do('set search_path=public,dbic_t_schema,dbic_t_schema_3');
       $dbh->do('create sequence public.artist_artistid_seq'); #< in the public schema
       $dbh->do(<<EOS);
- CREATE TABLE unq_nextval_schema2.artist
+ CREATE TABLE dbic_t_schema_5.artist
  (
    artistid integer not null default nextval('public.artist_artistid_seq'::regclass) PRIMARY KEY
    , name VARCHAR(100)
@@ -448,7 +372,7 @@ EOS
    , arrayfield INTEGER[]
  );
 EOS
-      $dbh->do('set search_path=testschema,public');
+      $dbh->do('set search_path=dbic_t_schema,public');
   });
 }
 
@@ -463,15 +387,15 @@ sub drop_test_schema {
         local $dbh->{Warn} = 0;
 
         for my $stat (
-                      'DROP SCHEMA unq_nextval_schema2 CASCADE',
+                      'DROP SCHEMA dbic_t_schema_5 CASCADE',
                       'DROP SEQUENCE public.artist_artistid_seq',
-                      'DROP SCHEMA unq_nextval_schema CASCADE',
-                      'DROP SCHEMA testschema CASCADE',
+                      'DROP SCHEMA dbic_t_schema_4 CASCADE',
+                      'DROP SCHEMA dbic_t_schema CASCADE',
                       'DROP SEQUENCE pkid1_seq',
                       'DROP SEQUENCE pkid2_seq',
                       'DROP SEQUENCE nonpkid_seq',
-                      'DROP SCHEMA anothertestschema CASCADE',
-                      'DROP SCHEMA yetanothertestschema CASCADE',
+                      'DROP SCHEMA dbic_t_schema_2 CASCADE',
+                      'DROP SCHEMA dbic_t_schema_3 CASCADE',
                      ) {
             eval { $dbh->do ($stat) };
             diag $@ if $@ && !$no_warn;
@@ -479,4 +403,158 @@ sub drop_test_schema {
     });
 }
 
-done_testing;
+
+###  auto-pk / last_insert_id / sequence discovery
+sub run_apk_tests {
+    my $schema = shift;
+
+    # This is in Core now, but it's here just to test that it doesn't break
+    $schema->class('Artist')->load_components('PK::Auto');
+    cmp_ok( $schema->resultset('Artist')->count, '==', 0, 'this should start with an empty artist table');
+
+    # test that auto-pk also works with the defined search path by
+    # un-schema-qualifying the table name
+    apk_t_set($schema,'artist');
+
+    my $unq_new;
+    lives_ok {
+        $unq_new = $schema->resultset('Artist')->create({ name => 'baz' });
+    } 'insert into unqualified, shadowed table succeeds';
+
+    is($unq_new && $unq_new->artistid, 1, "and got correct artistid");
+
+    my @test_schemas = ( [qw| dbic_t_schema_2    1  |],
+                         [qw| dbic_t_schema_3    1  |],
+                         [qw| dbic_t_schema_4    2  |],
+                         [qw| dbic_t_schema_5    1  |],
+                       );
+    foreach my $t ( @test_schemas ) {
+        my ($sch_name, $start_num) = @$t;
+        #test with dbic_t_schema_2
+        apk_t_set($schema,"$sch_name.artist");
+        my $another_new;
+        lives_ok {
+            $another_new = $schema->resultset('Artist')->create({ name => 'Tollbooth Willy'});
+            is( $another_new->artistid,$start_num, "got correct artistid for $sch_name")
+                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
+        } "$sch_name liid 1 did not die"
+            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
+        lives_ok {
+            $another_new = $schema->resultset('Artist')->create({ name => 'Adam Sandler'});
+            is( $another_new->artistid,$start_num+1, "got correct artistid for $sch_name")
+                or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
+        } "$sch_name liid 2 did not die"
+            or diag "USED SEQUENCE: ".($schema->source('Artist')->column_info('artistid')->{sequence} || '<none>');
+
+    }
+
+    lives_ok {
+        apk_t_set($schema,'dbic_t_schema.artist');
+        my $new = $schema->resultset('Artist')->create({ name => 'foo' });
+        is($new->artistid, 4, "Auto-PK worked");
+        $new = $schema->resultset('Artist')->create({ name => 'bar' });
+        is($new->artistid, 5, "Auto-PK worked");
+    } 'old auto-pk tests did not die either';
+}
+
+# sets the artist table name and clears sequence name cache
+sub apk_t_set {
+    my ( $s, $n ) = @_;
+    $s->source("Artist")->name($n);
+    $s->source('Artist')->column_info('artistid')->{sequence} = undef; #< clear sequence name cache
+}
+
+
+######## EXTENDED AUTO-PK TESTS
+
+BEGIN {
+  package DBICTest::Schema::ExtAPK;
+  push @main::test_classes, __PACKAGE__;
+
+  use strict;
+  use warnings;
+  use base 'DBIx::Class';
+
+  __PACKAGE__->load_components(qw/Core/);
+  __PACKAGE__->table('apk_t');
+
+  __PACKAGE__->add_columns(
+    map { $_ => { data_type => 'integer', is_auto_increment => 1 } }
+        qw( id1 id2 id3 id4 )
+  );
+
+  __PACKAGE__->set_primary_key('id1');
+}
+
+my @apk_schemas;
+BEGIN{ @apk_schemas = map "dbic_apk_$_", 0..5 }
+
+sub run_extended_apk_tests {
+  my $schema = shift;
+
+  eapk_drop_all($schema,'no warn');
+
+  # make the test schemas
+  $schema->storage->dbh_do(sub {
+    $_[1]->do("CREATE SCHEMA $_")
+        for @apk_schemas;
+  });
+
+  eapk_create($schema, with_search_path => [0,1]);
+
+  #unqualified table, unqualified 
+  lives_ok {
+    $schema->resultset('ExtAPK')->create({});
+  } 'create in first schema does not die';
+
+}
+
+sub eapk_create {
+    my ($schema, %a) = @_;
+
+    $schema->storage->dbh_do(sub {
+        my (undef,$dbh) = @_;
+
+        my $searchpath_save;
+        if ( $a{with_search_path} ) {
+            ($searchpath_save) = $dbh->selectrow_array('SHOW search_path');
+
+            my $search_path = join ',',@apk_schemas[@{$a{with_search_path}}];
+
+            $dbh->do("SET search_path = $search_path");
+        }
+
+        my $schema = $a{qualify} ? "$a{qualify}." : '';
+        $dbh->do(<<EOS);
+CREATE TABLE apk_t (
+  id1 serial primary key
+  , id2 serial
+  , id3 serial
+  , id4 serial
+)
+EOS
+
+        if( $searchpath_save ) {
+            $dbh->do("SET search_path = $searchpath_save");
+        }
+    });
+}
+
+
+sub eapk_drop_all {
+    my ( $schema, $no_warn ) = @_;
+
+    $schema->storage->dbh_do(sub {
+        my (undef,$dbh) = @_;
+
+        local $dbh->{Warn} = 0;
+
+        # drop the test schemas
+        for (@apk_schemas ) {
+            eval{ $dbh->do("DROP SCHEMA $_ CASCADE") };
+            diag $@ if $@ && !$no_warn;
+        }
+
+
+    });
+}