[Bast-commits] r7782 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader/DBI

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-10-13 14:46:22 +0000 (Tue, 13 Oct 2009)
New Revision: 7782

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
Log:
patch from Robert Bohne to make _table_uniq_info more correct for Oracle

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2009-10-13 09:27:18 UTC (rev 7781)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2009-10-13 14:46:22 UTC (rev 7782)
@@ -1,5 +1,8 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - patch from Robert Bohne to make _table_uniq_info more correct for
+          Oracle
+
 0.04999_09 2009-10-08
         - Only redump the files when something has actually changed
         - Place a warning at the top of the files saying 'do not modify' to

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm	2009-10-13 09:27:18 UTC (rev 7781)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm	2009-10-13 14:46:22 UTC (rev 7782)
@@ -80,12 +80,12 @@
         q{
             SELECT constraint_name, acc.column_name
             FROM all_constraints JOIN all_cons_columns acc USING (constraint_name)
-            WHERE acc.table_name=? AND constraint_type='U'
+            WHERE acc.table_name=? and acc.owner = ? AND constraint_type='U'
             ORDER BY acc.position
         },
         {}, 1);
 
-    $sth->execute(uc $table);
+    $sth->execute(uc $table,$self->{db_schema} );
     my %constr_names;
     while(my $constr = $sth->fetchrow_arrayref) {
         my $constr_name = lc $constr->[0];