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

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2008-06-08 14:25:19 +0100 (Sun, 08 Jun 2008)
New Revision: 4476

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
Log:
Fix Oracle constraint and auto-increment detection for non-owned schemas

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2008-06-08 13:18:48 UTC (rev 4475)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2008-06-08 13:25:19 UTC (rev 4476)
@@ -6,6 +6,8 @@
         - Add "dbicdump" script for easy commandline dumping
         - Throw out the in-memory class generation, just dump to a temporary
           directory if the user didn't specify one
+        - Fix Oracle constraint and auto-increment detection for non-owned schemas
+          (RT #35732)
 
 0.04999_05 Mon Apr 14, 2008
         - Fix limiting table list to the specified schema for DB2

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	2008-06-08 13:18:48 UTC (rev 4475)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm	2008-06-08 13:25:19 UTC (rev 4476)
@@ -78,10 +78,10 @@
 
     my $sth = $dbh->prepare_cached(
         q{
-            SELECT constraint_name, ucc.column_name
-            FROM user_constraints JOIN user_cons_columns ucc USING (constraint_name)
-            WHERE ucc.table_name=? AND constraint_type='U'
-            ORDER BY ucc.position
+            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'
+            ORDER BY acc.position
         },
         {}, 1);
 
@@ -131,8 +131,8 @@
     my $sth = $dbh->prepare_cached(
         q{
             SELECT COUNT(*)
-            FROM user_triggers ut JOIN user_trigger_cols utc USING (trigger_name)
-            WHERE utc.table_name = ? AND utc.column_name = ?
+            FROM all_triggers ut JOIN all_trigger_cols atc USING (trigger_name)
+            WHERE atc.table_name = ? AND atc.column_name = ?
             AND column_usage LIKE '%NEW%' AND column_usage LIKE '%OUT%'
             AND trigger_type = 'BEFORE EACH ROW' AND triggering_event LIKE '%INSERT%'
         },