Now Oracle supports table renaming (both sequence and triggers

are kept on sync with the new table name)

diff --git a/lib/xmldb/classes/generators/XMLDBGenerator.class.php b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
index 6604d62622538e8e0d7222481dfd0b6be14a9ebd..16118b16ac264cc00c0eccffc006ef044fa88d10 100644 (file)
--- a/lib/xmldb/classes/generators/XMLDBGenerator.class.php
+++ b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
@@ -95,12 +95,12 @@ class XMLDBgenerator {
     var $rename_table_sql = 'ALTER TABLE OLDNAME RENAME TO NEWNAME'; //SQL sentence to rename one table, both
                                   //OLDNAME and NEWNAME are dinamically replaced
 
-    var $rename_table_extra_code = false; //Does the generatos need to add code after table rename
+    var $rename_table_extra_code = false; //Does the generator need to add code after table rename
 
     var $drop_table_sql = 'DROP TABLE TABLENAME'; //SQL sentence to drop one table
                                   //TABLENAME is dinamically replaced
 
-    var $drop_table_extra_code = false; //Does the generatos need to add code after table drop
+    var $drop_table_extra_code = false; //Does the generator need to add code after table drop
 
     var $alter_column_sql = 'ALTER TABLE TABLENAME ALTER COLUMN COLUMNSPECS'; //The SQL template to alter columns
 

diff --git a/lib/xmldb/classes/generators/oci8po/oci8po.class.php b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
index 0a2ba5e96af970fb385ba909bc144fda9cd61bd9..8f83996f3e05b68e20cc58ba05b1c2a8f7ede43f 100644 (file)
--- a/lib/xmldb/classes/generators/oci8po/oci8po.class.php
+++ b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
@@ -49,14 +49,16 @@ class XMLDBoci8po extends XMLDBgenerator {
     var $sequence_extra_code = true; //Does the generator need to add extra code to generate the sequence fields
     var $sequence_name = ''; //Particular name for inline sequences in this generator
 
-    var $drop_table_extra_code = true; //Does the generatos need to add code after table drop
+    var $drop_table_extra_code = true; //Does the generator need to add code after table drop
+
+    var $rename_table_extra_code = true; //Does the generator need to add code after table rename
 
     var $enum_inline_code = false; //Does the generator need to add inline code in the column definition
 
     var $alter_column_sql = 'ALTER TABLE TABLENAME MODIFY (COLUMNSPECS)'; //The SQL template to alter columns
 
     /**
-     * Creates one new XMLDBpostgres7
+     * Creates one new XMLDBoci8po
      */
     function XMLDBoci8po() {
         parent::XMLDBgenerator();
@@ -129,6 +131,8 @@ class XMLDBoci8po extends XMLDBgenerator {
      */
     function getCreateSequenceSQL ($xmldb_table, $xmldb_field) {
 
+        $results = array();
+
         $sequence_name = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'seq');
 
         $sequence = "CREATE SEQUENCE " . $sequence_name;
@@ -136,7 +140,20 @@ class XMLDBoci8po extends XMLDBgenerator {
         $sequence.= "\n    INCREMENT BY 1";
         $sequence.= "\n    NOMAXVALUE";
 
+        $results[] = $sequence;
+
+        $results = array_merge($results, $this->getCreateTriggerSQL ($xmldb_table, $xmldb_field));
+
+        return $results;
+    }
+
+    /**
+     * Returns the code needed to create one trigger for the xmldb_table and xmldb_field passed
+     */
+    function getCreateTriggerSQL ($xmldb_table, $xmldb_field) {
+
         $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";
@@ -147,7 +164,8 @@ class XMLDBoci8po extends XMLDBgenerator {
         $trigger.= "\n        SELECT " . $sequence_name . '.nextval INTO :new.' . $this->getEncQuoted($xmldb_field->getName()) . " FROM dual;";
         $trigger.= "\n    END IF;";
         $trigger.= "\nEND;";
-        return array($sequence, $trigger);
+
+        return array($trigger);
     }
 
     /**
@@ -191,6 +209,35 @@ class XMLDBoci8po extends XMLDBgenerator {
         return $this->getDropSequenceSQL($xmldb_table, $xmldb_field, false);
     }
 
+    /**
+     * Returns the code (array of statements) needed to execute extra statements on table rename
+     */
+    function getRenameTableExtraSQL ($xmldb_table, $newname) {
+
+        $results = array();
+
+        $xmldb_field = new XMLDBField('id'); // Fields having sequences should be exclusively, id.
+
+        $oldseqname = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'seq');
+        $newseqname = $this->getNameForObject($newname, $xmldb_field->getName(), 'seq');
+
+    /// Rename de sequence
+        $results[] = 'RENAME ' . $oldseqname . ' TO ' . $newseqname;
+
+        $oldtriggername = $this->getNameForObject($xmldb_table->getName(), $xmldb_field->getName(), 'trg');
+        $newtriggername = $this->getNameForObject($newname, $xmldb_field->getName(), 'trg');
+
+    /// Drop old trigger
+        $results[] = "DROP TRIGGER " . $oldtriggername;
+
+        $new_xmldb_table = new XMLDBTable($newname); /// Temp table for trigger code generation
+
+    /// Create new trigger
+        $results = array_merge($results, $this->getCreateTriggerSQL($new_xmldb_table, $xmldb_field));
+
+        return $results;
+    }
+
     /**
      * Given one XMLDBTable and one XMLDBField, return the SQL statements needded to alter the field in the table
      * Oracle has some severe limits: