X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=2042b30799a7fec7e0b2c30f4824dc9c973abd3c;hb=7507c8ce0703993b79b31bf90144e28ef97d4a9d;hp=dbc04702589721f3d6f0cfc83ee229b43dbff93b;hpb=996be9ee6e82ec9928f801ecdc69c9e07d64339c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index dbc0470..2042b30 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -3,20 +3,22 @@ package DBIx::Class::Schema::Loader::DBI::Pg;
 use strict;
 use warnings;
 use base 'DBIx::Class::Schema::Loader::DBI';
+use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
+our $VERSION = '0.04000';
+
 =head1 NAME
 
-DBIx::Class::Schema::Loader::DBI::Pg - DBIx::Class::Schema::Loader::DBI Postgres Implementation.
+DBIx::Class::Schema::Loader::DBI::Pg - DBIx::Class::Schema::Loader::DBI
+PostgreSQL Implementation.
 
 =head1 SYNOPSIS
 
   package My::Schema;
   use base qw/DBIx::Class::Schema::Loader/;
 
-  __PACKAGE__->loader_options(
-    relationships => 1,
-  );
+  __PACKAGE__->loader_options( debug => 1 );
 
   1;
 
@@ -36,31 +38,57 @@ sub _setup {
 sub _table_uniq_info {
     my ($self, $table) = @_;
 
+    # Use the default support if available
+    return $self->next::method($table)
+        if $DBD::Pg::VERSION >= 1.50;
+
     my @uniqs;
     my $dbh = $self->schema->storage->dbh;
 
-    my $sth = $dbh->prepare_cached(
-        qq{SELECT conname,indexdef FROM pg_indexes JOIN pg_constraint }
-      . qq{ON (pg_indexes.indexname = pg_constraint.conname) }
-      . qq{WHERE schemaname=? and tablename=? and contype = 'u'}
-    ,{}, 1);
-
-    $sth->execute($self->db_schema, $table);
-    while(my $constr = $sth->fetchrow_arrayref) {
-        my $constr_name = $constr->[0];
-        my $constr_def  = $constr->[1];
-        my @cols;
-        if($constr_def =~ /\(\s*([^)]+)\)\s*$/) {
-            my $cols_text = $1;
-            $cols_text =~ s/\s+$//;
-            @cols = map { lc } split(/\s*,\s*/, $cols_text);
-            s/\Q$self->{_quoter}\E// for @cols;
+    # Most of the SQL here is mostly based on
+    #   Rose::DB::Object::Metadata::Auto::Pg, after some prodding from
+    #   John Siracusa to use his superior SQL code :)
+
+    my $attr_sth = $self->{_cache}->{pg_attr_sth} ||= $dbh->prepare(
+        q{SELECT attname FROM pg_catalog.pg_attribute
+        WHERE attrelid = ? AND attnum = ?}
+    );
+
+    my $uniq_sth = $self->{_cache}->{pg_uniq_sth} ||= $dbh->prepare(
+        q{SELECT x.indrelid, i.relname, x.indkey
+        FROM
+          pg_catalog.pg_index x
+          JOIN pg_catalog.pg_class c ON c.oid = x.indrelid
+          JOIN pg_catalog.pg_class i ON i.oid = x.indexrelid
+          JOIN pg_catalog.pg_constraint con ON con.conname = i.relname
+          LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+        WHERE
+          x.indisunique = 't' AND
+          c.relkind     = 'r' AND
+          i.relkind     = 'i' AND
+          con.contype   = 'u' AND
+          n.nspname     = ? AND
+          c.relname     = ?}
+    );
+
+    $uniq_sth->execute($self->db_schema, $table);
+    while(my $row = $uniq_sth->fetchrow_arrayref) {
+        my ($tableid, $indexname, $col_nums) = @$row;
+        $col_nums =~ s/^\s+//;
+        my @col_nums = split(/\s+/, $col_nums);
+        my @col_names;
+
+        foreach (@col_nums) {
+            $attr_sth->execute($tableid, $_);
+            my $name_aref = $attr_sth->fetchrow_arrayref;
+            push(@col_names, $name_aref->[0]) if $name_aref;
         }
-        if(!@cols) {
-            warn "Failed to parse unique constraint $constr_name on $table";
+
+        if(!@col_names) {
+            warn "Failed to parse UNIQUE constraint $indexname on $table";
         }
         else {
-            push(@uniqs, [ $constr_name => \@cols ]);
+            push(@uniqs, [ $indexname => \@col_names ]);
         }
     }