From dd884a3ac51e690d73ecfa6d35660ad683a7c76e Mon Sep 17 00:00:00 2001 From: Eloy Lafuente Date: Thu, 18 Mar 2010 01:50:32 +0000 Subject: [PATCH] NOBUG: Get back Oracle to normality (fix trigger/seq generation) after latest cache changes --- lib/ddl/oracle_sql_generator.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/ddl/oracle_sql_generator.php b/lib/ddl/oracle_sql_generator.php index c37b5eea700..532be07d108 100644 --- a/lib/ddl/oracle_sql_generator.php +++ b/lib/ddl/oracle_sql_generator.php @@ -203,7 +203,7 @@ class oracle_sql_generator extends sql_generator { $results[] = $sequence; - $results = array_merge($results, $this->getCreateTriggerSQL ($xmldb_table, $xmldb_field)); + $results = array_merge($results, $this->getCreateTriggerSQL ($xmldb_table, $xmldb_field, $sequence_name)); return $results; } @@ -211,10 +211,9 @@ class oracle_sql_generator extends sql_generator { /** * Returns the code needed to create one trigger for the xmldb_table and xmldb_field passed */ - public function getCreateTriggerSQL($xmldb_table, $xmldb_field) { + public function getCreateTriggerSQL($xmldb_table, $xmldb_field, $sequence_name) { $trigger_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'trg'); - $sequence_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'seq'); $trigger = "CREATE TRIGGER " . $trigger_name; $trigger.= "\n BEFORE INSERT"; @@ -293,7 +292,7 @@ class oracle_sql_generator extends sql_generator { /// Create new trigger $newt = new xmldb_table($newname); /// Temp table for trigger code generation - $results = array_merge($results, $this->getCreateTriggerSQL($newt, $xmldb_field)); + $results = array_merge($results, $this->getCreateTriggerSQL($newt, $xmldb_field, $newseqname)); /// Rename all the check constraints in the table $oldtablename = $this->getTableName($xmldb_table); -- 2.17.1