deploying works

diff --git a/lib/DBIx/Class/SQLMaker/Pg.pm b/lib/DBIx/Class/SQLMaker/PostgreSQL.pm
similarity index 97%
rename from lib/DBIx/Class/SQLMaker/Pg.pm
rename to lib/DBIx/Class/SQLMaker/PostgreSQL.pm
index 2431c6a..23083ea 100644 (file)
--- a/lib/DBIx/Class/SQLMaker/Pg.pm
+++ b/lib/DBIx/Class/SQLMaker/PostgreSQL.pm
@@ -1,5 +1,5 @@
 package
-  DBIx::Class::SQLMaker::Pg;
+  DBIx::Class::SQLMaker::PostgreSQL;
 
 use strict;
 use warnings;

diff --git a/t/pg_with_recursive.t b/t/pg_with_recursive.t
index 189a3a2..f03307d 100644 (file)
--- a/t/pg_with_recursive.t
+++ b/t/pg_with_recursive.t
@@ -14,7 +14,7 @@ $ENV{NLS_COMP} = "BINARY";
 $ENV{NLS_LANG} = "AMERICAN";
 use DBICTest::Schema::Artist;
 BEGIN {
-  DBICTest::Schema::Artist->add_column('parentid' => { data_type => 'integer', is_nullable => 0 });
+  DBICTest::Schema::Artist->add_column('parentid' => { data_type => 'integer', is_nullable => 1 });
 
   DBICTest::Schema::Artist->has_many(
     children => 'DBICTest::Schema::Artist',
@@ -34,10 +34,9 @@ note "Pg Version: " . $schema->storage->_server_info->{dbms_version};
 
 my $dbh = $schema->storage->dbh;
 
-$schema->txn_do( sub {
-$schema->deploy;
+do_creates($dbh);
 ### test hierarchical queries
-#{
+{
   $schema->resultset('Artist')->create ({
     name => 'root',
     rank => 1,
@@ -93,7 +92,71 @@ $schema->deploy;
 
   $schema->resultset('Artist')->find({ name => 'cycle-root' })
     ->update({ parentid => { -ident => 'artistid' } });
-#}
-});
+}
+
+sub do_creates {
+  my ( $dbh, $q ) = @_;
+  do_clean($dbh);
+  $dbh->do(qq{
+    BEGIN;
+    CREATE TABLE "artist" (
+      "parentid" integer,
+      "artistid" serial NOT NULL,
+      "name" character varying(100),
+      "rank" integer DEFAULT 13 NOT NULL,
+      "charfield" character(10),
+      PRIMARY KEY ("artistid"),
+      CONSTRAINT "artist_name" UNIQUE ("name"),
+      CONSTRAINT "u_nullable" UNIQUE ("charfield", "rank")
+    );
+
+    CREATE TABLE "cd" (
+      "cdid" serial NOT NULL,
+      "artist" integer NOT NULL,
+      "title" character varying(100) NOT NULL,
+      "year" character varying(100) NOT NULL,
+      "genreid" integer,
+      "single_track" integer,
+      PRIMARY KEY ("cdid"),
+      CONSTRAINT "cd_artist_title" UNIQUE ("artist", "title")
+    );
+    CREATE INDEX "cd_idx_artist" on "cd" ("artist");
+    CREATE INDEX "cd_idx_genreid" on "cd" ("genreid");
+    CREATE INDEX "cd_idx_single_track" on "cd" ("single_track");
+
+    CREATE TABLE "track" (
+      "trackid" serial NOT NULL,
+      "cd" integer NOT NULL,
+      "position" integer NOT NULL,
+      "title" character varying(100) NOT NULL,
+      "last_updated_on" timestamp,
+      "last_updated_at" timestamp,
+      PRIMARY KEY ("trackid"),
+      CONSTRAINT "track_cd_position" UNIQUE ("cd", "position"),
+      CONSTRAINT "track_cd_title" UNIQUE ("cd", "title")
+    );
+    CREATE INDEX "track_idx_cd" on "track" ("cd");
+    COMMIT;
+  });
 
+}
+
+sub do_clean {
+  my $dbh = shift;
+  eval {
+    $dbh->do(qq{
+      DROP TABLE "artist" CASCADE;
+      DROP TABLE "cd" CASCADE;
+      DROP TABLE "track" CASCADE;
+    });
+  };
+}
+END {
+  for ($dbh) {
+    next unless $_;
+    local $SIG{__WARN__} = sub {};
+    do_clean($_);
+  }
+  undef $dbh;
+}
 done_testing;