Merge branch 'topic/better-multi-schema' into master

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / DBI / Pg.pm

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index 374a31b..09d7854 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -52,25 +52,27 @@ sub _table_fk_info {
     my ($self, $table) = @_;
 
     my $sth = $self->dbh->prepare_cached(<<"EOF");
-select q.constr_name, q.to_schema, q.to_table, from_cols.attname from_col, to_cols.attname to_col,
-       q.on_delete, q.on_update, q.is_deferrable
-from (select constr.conname constr_name, to_ns.nspname to_schema, to_class.relname to_table,
-             unnest(constr.conkey) from_colnum, unnest(constr.confkey) to_colnum,
-             constr.confdeltype on_delete, constr.confupdtype on_update,
-             constr.condeferrable is_deferrable,
-             constr.conrelid conrelid, constr.confrelid confrelid
-      from pg_constraint constr
-      join pg_namespace from_ns on constr.connamespace = from_ns.oid
-      join pg_class from_class on constr.conrelid = from_class.oid and from_class.relnamespace = from_ns.oid
-      join pg_class to_class on constr.confrelid = to_class.oid
-      join pg_namespace to_ns on to_class.relnamespace = to_ns.oid
+      select constr.conname, to_ns.nspname, to_class.relname, from_col.attname, to_col.attname,
+             constr.confdeltype, constr.confupdtype, constr.condeferrable
+      from pg_catalog.pg_constraint constr
+      join pg_catalog.pg_namespace from_ns on constr.connamespace = from_ns.oid
+      join pg_catalog.pg_class from_class on constr.conrelid = from_class.oid and from_class.relnamespace = from_ns.oid
+      join pg_catalog.pg_class to_class on constr.confrelid = to_class.oid
+      join pg_catalog.pg_namespace to_ns on to_class.relnamespace = to_ns.oid
+      -- can't do unnest() until 8.4, so join against a series table instead
+      join pg_catalog.generate_series(1, pg_catalog.current_setting('max_index_keys')::integer) colnum(i)
+           on colnum.i <= pg_catalog.array_upper(constr.conkey,1)
+      join pg_catalog.pg_attribute to_col
+           on to_col.attrelid = constr.confrelid
+           and to_col.attnum = constr.confkey[colnum.i]
+      join pg_catalog.pg_attribute from_col
+           on from_col.attrelid = constr.conrelid
+           and from_col.attnum = constr.conkey[colnum.i]
       where from_ns.nspname = ?
         and from_class.relname = ?
         and from_class.relkind = 'r'
         and constr.contype = 'f'
-) q
-join pg_attribute from_cols on from_cols.attrelid = q.conrelid and from_cols.attnum = q.from_colnum
-join pg_attribute to_cols on to_cols.attrelid = q.confrelid and to_cols.attnum = q.to_colnum;
+      order by constr.conname, colnum.i
 EOF
 
     $sth->execute($table->schema, $table->name);
@@ -167,9 +169,9 @@ sub _table_comment {
     return $table_comment if $table_comment;
 
     ($table_comment) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema);
-SELECT obj_description(oid)
-FROM pg_class
-WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?)
+SELECT pg_catalog.obj_description(oid)
+FROM pg_catalog.pg_class
+WHERE relname=? AND relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname=?)
 EOF
 
     return $table_comment
@@ -186,11 +188,11 @@ sub _column_comment {
 
     my ($table_oid) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema);
 SELECT oid
-FROM pg_class
-WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?)
+FROM pg_catalog.pg_class
+WHERE relname=? AND relnamespace=(SELECT oid FROM pg_catalog.pg_namespace WHERE nspname=?)
 EOF
 
-    return $self->dbh->selectrow_array('SELECT col_description(?,?)', {}, $table_oid, $column_number);
+    return $self->dbh->selectrow_array('SELECT pg_catalog.col_description(?,?)', {}, $table_oid, $column_number);
 }
 
 # Make sure data_type's that don't need it don't have a 'size' column_info, and