Merge pull request #37 from owncloud/oracle_fixes

oracle_fixes
owncloud-archive · Jul 8, 2013 · 2176267 · 2176267
2 parents 3ef9f73 + 626598a
commit 2176267
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/MDB2/Driver/Manager/oci8.php b/MDB2/Driver/Manager/oci8.php
@@ -282,7 +282,7 @@ function _dropAutoincrement($table)
             return $db;
         }
 
-        $table = strtoupper($table);
+        $table_uppercase = strtoupper($table);
         $trigger_name = $table . '_AI_PK';
         $trigger_name_quoted = $db->quote($trigger_name, 'text');
         $query = 'SELECT trigger_name FROM user_triggers';
@@ -293,7 +293,7 @@ function _dropAutoincrement($table)
         }
 
         if ($trigger) {
-            $trigger_name  = $db->quoteIdentifier($table . '_AI_PK', true);
+            $trigger_name  = $db->quoteIdentifier($trigger, true);
             $trigger_sql = 'DROP TRIGGER ' . $trigger_name;
             $result = $db->exec($trigger_sql);
             if (PEAR::isError($result)) {
@@ -307,7 +307,7 @@ function _dropAutoincrement($table)
                     'sequence for autoincrement PK could not be dropped', __FUNCTION__);
             }
 
-            $index_name = $table . '_AI_PK';
+            $index_name = $table_uppercase . '_AI_PK';
             $idxname_format = $db->getOption('idxname_format');
             $db->setOption('idxname_format', '%s');
             $result1 = $this->dropConstraint($table, $index_name);