X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F72pg.t;h=39d7d5ac81382d8ab4d21e87c528ce0f5b7aa1e9;hb=944ed10e7287d5ccda9386c38f272d839e9da329;hp=45e614fb3ff15a008ae8f4634ff26d057b6afa0b;hpb=6ffb5be522e752ea1ad2a99d36648535fe30a43b;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/72pg.t b/t/72pg.t
index 45e614f..39d7d5a 100644
--- a/t/72pg.t
+++ b/t/72pg.t
@@ -1,7 +1,8 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
+use Test::Warn;
 use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
@@ -15,10 +16,15 @@ use DBICTest;
 
   __PACKAGE__->load_components(qw/Core/);
   __PACKAGE__->table('testschema.casecheck');
-  __PACKAGE__->add_columns(qw/id name NAME uc_name/);
+  __PACKAGE__->add_columns(qw/id name NAME uc_name storecolumn/);
   __PACKAGE__->column_info_from_storage(1);
   __PACKAGE__->set_primary_key('id');
 
+  sub store_column {
+    my ($self, $name, $value) = @_;
+    $value = '#'.$value if($name eq "storecolumn");
+    $self->maybe::next::method($name, $value);
+  }
 }
 
 {
@@ -38,18 +44,27 @@ use DBICTest;
 
 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: 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\'!)'
-    unless ($dsn && $user);
+plan skip_all => <<EOM unless $dsn && $user;
+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'
+)
+EOM
 
+DBICTest::Schema->load_classes( 'Casecheck', 'ArrayTest' );
 
-plan tests => 37;
+# make sure sqlt_type overrides work (::Storage::DBI::Pg does this)
+{
+  my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
-DBICTest::Schema->load_classes( 'Casecheck', 'ArrayTest' );
-my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+  ok (!$schema->storage->_dbh, 'definitely not connected');
+  is ($schema->storage->sqlt_type, 'PostgreSQL', 'sqlt_type correct pre-connection');
+}
 
+my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 # Check that datetime_parser returns correctly before we explicitly connect.
 SKIP: {
     eval { require DateTime::Format::Pg };
@@ -67,26 +82,149 @@ $schema->source("Artist")->name("testschema.artist");
 $schema->source("SequenceTest")->name("testschema.sequence_test");
 {
     local $SIG{__WARN__} = sub {};
+    _cleanup ($dbh);
+
+    my $artist_table_def = <<EOS;
+(
+  artistid serial PRIMARY KEY
+  , name VARCHAR(100)
+  , rank INTEGER NOT NULL DEFAULT '13'
+  , charfield CHAR(10)
+  , arrayfield INTEGER[]
+)
+EOS
     $dbh->do("CREATE SCHEMA testschema;");
-    $dbh->do("CREATE TABLE testschema.artist (artistid serial PRIMARY KEY, name VARCHAR(100), rank INTEGER NOT NULL DEFAULT '13', charfield CHAR(10), arrayfield INTEGER[]);");
+    $dbh->do("CREATE TABLE testschema.artist $artist_table_def;");
     $dbh->do("CREATE TABLE testschema.sequence_test (pkid1 integer, pkid2 integer, nonpkid integer, name VARCHAR(100), CONSTRAINT pk PRIMARY KEY(pkid1, pkid2));");
     $dbh->do("CREATE SEQUENCE pkid1_seq START 1 MAXVALUE 999999 MINVALUE 0");
     $dbh->do("CREATE SEQUENCE pkid2_seq START 10 MAXVALUE 999999 MINVALUE 0");
     $dbh->do("CREATE SEQUENCE nonpkid_seq START 20 MAXVALUE 999999 MINVALUE 0");
-    ok ( $dbh->do('CREATE TABLE testschema.casecheck (id serial PRIMARY KEY, "name" VARCHAR(1), "NAME" VARCHAR(2), "UC_NAME" VARCHAR(3));'), 'Creation of casecheck table');
+    ok ( $dbh->do('CREATE TABLE testschema.casecheck (id serial PRIMARY KEY, "name" VARCHAR(1), "NAME" VARCHAR(2), "UC_NAME" VARCHAR(3), "storecolumn" VARCHAR(10));'), 'Creation of casecheck table');
     ok ( $dbh->do('CREATE TABLE testschema.array_test (id serial PRIMARY KEY, arrayfield INTEGER[]);'), 'Creation of array_test table');
+    $dbh->do("CREATE SCHEMA anothertestschema;");
+    $dbh->do("CREATE TABLE anothertestschema.artist $artist_table_def;");
+    $dbh->do("CREATE SCHEMA yetanothertestschema;");
+    $dbh->do("CREATE TABLE yetanothertestschema.artist $artist_table_def;");
+    $dbh->do('set search_path=testschema,public');
+    $dbh->do("CREATE SCHEMA unq_nextval_schema;");
+    $dbh->do("CREATE SCHEMA unq_nextval_schema2;");
+    $dbh->do(<<EOS);
+ CREATE TABLE unq_nextval_schema.artist
+ (
+   artistid integer not null default nextval('artist_artistid_seq'::regclass) PRIMARY KEY
+   , name VARCHAR(100)
+   , rank INTEGER NOT NULL DEFAULT '13'
+   , charfield CHAR(10)
+   , arrayfield INTEGER[]
+ );
+EOS
+    $dbh->do('set search_path=public,testschema,yetanothertestschema');
+    $dbh->do('create sequence public.artist_artistid_seq'); #< in the public schema
+    $dbh->do(<<EOS);
+ CREATE TABLE unq_nextval_schema2.artist
+ (
+   artistid integer not null default nextval('public.artist_artistid_seq'::regclass) PRIMARY KEY
+   , name VARCHAR(100)
+   , rank INTEGER NOT NULL DEFAULT '13'
+   , charfield CHAR(10)
+   , arrayfield INTEGER[]
+ );
+EOS
+    $dbh->do('set search_path=testschema,public');
+
 }
 
+# store_column is called once for create() for non sequence columns
+
+ok(my $storecolumn = $schema->resultset('Casecheck')->create({'storecolumn' => 'a'}));
+
+is($storecolumn->storecolumn, '#a'); # was '##a'
+
 # This is in Core now, but it's here just to test that it doesn't break
 $schema->class('Artist')->load_components('PK::Auto');
 
-my $new = $schema->resultset('Artist')->create({ name => 'foo' });
+cmp_ok( $schema->resultset('Artist')->count, '==', 0, 'this should start with an empty artist table');
 
-is($new->artistid, 1, "Auto-PK worked");
+{ # 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");
 
-$new = $schema->resultset('Artist')->create({ name => 'bar' });
+  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 |],
+                     );
+  warnings_exist {
+    TODO: {
+          local $TODO = 'have not figured out a 100% reliable way to tell which schema an unqualified seq is in';
+
+          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>');
+
+          }
+      }
+  } [ (qr/guessing sequence/)x2], 'got a bunch of warnings from unqualified schema guessing';
+
+  $schema->source('Artist')->column_info('artistid')->{sequence} = undef; #< clear sequence name cache
+  $schema->source("Artist")->name($artist_name_save);
+}
+
+my $new;
+lives_ok {
+    $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';
 
-is($new->artistid, 2, "Auto-PK worked");
 
 my $test_type_info = {
     'artistid' => {
@@ -131,8 +269,7 @@ is_deeply($type_info, $test_type_info,
           'columns_info_for - column data types');
 
 SKIP: {
-  skip "SQL::Abstract < 1.49 does not pass through arrayrefs", 4
-    if $SQL::Abstract::VERSION < 1.49;
+  skip "Need DBD::Pg 2.9.2 or newer for array tests", 4 if $DBD::Pg::VERSION < 2.009002;
 
   lives_ok {
     $schema->resultset('ArrayTest')->create({
@@ -153,7 +290,7 @@ SKIP: {
   my $count;
   lives_ok {
     $count = $schema->resultset('ArrayTest')->search({
-      arrayfield => \[ '= ?' => [arrayfield => [3, 4]] ],   #TODO anything less ugly than this?
+      arrayfield => \[ '= ?' => [arrayfield => [3, 4]] ],   #Todo anything less ugly than this?
     })->count;
   } 'comparing arrayref to pg array data does not blow up';
   is($count, 1, 'comparing arrayref to pg array data gives correct result');
@@ -246,30 +383,46 @@ SKIP: {
     });
 }
 
-SKIP: {
-  skip "Oracle Auto-PK tests are broken", 16;
-
-  # test auto increment using sequences WITHOUT triggers
-  for (1..5) {
+for (1..5) {
     my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' });
     is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key");
     is($st->pkid2, $_ + 9, "Oracle Auto-PK without trigger: Second primary key");
     is($st->nonpkid, $_ + 19, "Oracle Auto-PK without trigger: Non-primary key");
-  }
-  my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 });
-  is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually");
 }
-
-END {
-    if($dbh) {
-        $dbh->do("DROP TABLE testschema.artist;");
-        $dbh->do("DROP TABLE testschema.casecheck;");
-        $dbh->do("DROP TABLE testschema.sequence_test;");
-        $dbh->do("DROP TABLE testschema.array_test;");
-        $dbh->do("DROP SEQUENCE pkid1_seq");
-        $dbh->do("DROP SEQUENCE pkid2_seq");
-        $dbh->do("DROP SEQUENCE nonpkid_seq");
-        $dbh->do("DROP SCHEMA testschema;");
-    }
+my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 });
+is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually");
+
+#_cleanup ($dbh);
+
+done_testing;
+
+
+sub _cleanup {
+  my $dbh = shift or return;
+  $dbh->ping or return;
+
+  for my $stat (
+    'DROP TABLE unq_nextval_schema2.artist',
+    'DROP SCHEMA unq_nextval_schema2',
+    'DROP SEQUENCE public.artist_artistid_seq',
+    'DROP TABLE unq_nextval_schema.artist',
+    'DROP SCHEMA unq_nextval_schema',
+    'DROP TABLE testschema.artist',
+    'DROP TABLE testschema.casecheck',
+    'DROP TABLE testschema.sequence_test',
+    'DROP TABLE testschema.array_test',
+    'DROP SEQUENCE pkid1_seq',
+    'DROP SEQUENCE pkid2_seq',
+    'DROP SEQUENCE nonpkid_seq',
+    'DROP SCHEMA testschema',
+    'DROP TABLE anothertestschema.artist',
+    'DROP SCHEMA anothertestschema',
+    'DROP TABLE yetanothertestschema.artist',
+    'DROP SCHEMA yetanothertestschema',
+  ) {
+    eval { $dbh->do ($stat) };
+    diag $@ if $@;
+  }
 }
 
+END { _cleanup($dbh) }