From: ivan <ivan>
Date: Wed, 3 Jun 2009 19:21:17 +0000 (+0000)
Subject: Pg: se default_db_schema when adding SERIAL columns instead of hardcoding "public".
X-Git-Tag: DBIx_DBSchema_0_38~8
X-Git-Url: http://git.freeside.biz/gitweb/?p=DBIx-DBSchema.git;a=commitdiff_plain;h=67bdf8ab29e1fe0b2a057d9955a30bb363cda1f6

Pg: se default_db_schema when adding SERIAL columns instead of hardcoding "public".
---

diff --git a/Changes b/Changes
index 55a349b..38b8351 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,8 @@ Revision history for Perl extension DBIx::DBSchema.
 0.37 unreleased
         - Patch from Slavin Rezic <srezic@cpan.org> to prevent quoting around
           numeric defaults in Pg.
+        - Pg: use default_db_schema when adding SERIAL columns instead of
+          hardcoding "public".
 
 0.36 Thu Dec 13 17:49:35 PST 2007
         - Patch from ISHIGAKI@cpan.org to suppress unnecessary warnings about
diff --git a/DBSchema.pm b/DBSchema.pm
index d2bdd35..ac4941b 100644
--- a/DBSchema.pm
+++ b/DBSchema.pm
@@ -10,7 +10,7 @@ use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::ColGroup::Index;
 
-$VERSION = "0.37_01";
+$VERSION = "0.37_02";
 $VERSION = eval $VERSION; # modperlstyle: convert the string into a number
 
 $DEBUG = 0;
diff --git a/DBSchema/DBD/Pg.pm b/DBSchema/DBD/Pg.pm
index fae68e1..da49009 100644
--- a/DBSchema/DBD/Pg.pm
+++ b/DBSchema/DBD/Pg.pm
@@ -177,7 +177,8 @@ sub add_column_callback {
     my $nextval;
     warn $warning if $warning;
     if ( $pg_server_version >= 70300 ) {
-      $nextval = "nextval('public.${table}_${name}_seq'::text)";
+      my $db_schema  = default_db_schema();
+      $nextval = "nextval('$db_schema.${table}_${name}_seq'::text)";
     } else {
       $nextval = "nextval('${table}_${name}_seq'::text)";
     }
@@ -288,7 +289,7 @@ Ivan Kohler <ivan-dbix-dbschema@420.am>
 
 Copyright (c) 2000 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2007 Freeside Internet Services, Inc.
+Copyright (c) 2009 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.