Deleting some parameters that aren't needed anymore. Code will

decide if creating underlying indexes for keys automatically now.

diff --git a/lib/xmldb/classes/generators/mssql/mssql.class.php b/lib/xmldb/classes/generators/mssql/mssql.class.php
index 61ba212407dff28d9f04d75b076239996682e3d1..e2cdc88fd1843e6ed4401c7d37baa781c07992ad 100644 (file)
--- a/lib/xmldb/classes/generators/mssql/mssql.class.php
+++ b/lib/xmldb/classes/generators/mssql/mssql.class.php
@@ -45,10 +45,6 @@ class XMLDBmssql extends XMLDBgenerator {
     var $unique_keys = false; // Does the generator build unique keys
     var $foreign_keys = false; // Does the generator build foreign keys
 
-    var $primary_index = false;// Does the generator need to build one index for primary keys
-    var $unique_index = true;  // Does the generator need to build one index for unique keys
-    var $foreign_index = true; // Does the generator need to build one index for foreign keys
-
     var $sequence_extra_code = false; //Does the generator need to add extra code to generate the sequence fields
     var $sequence_name = 'IDENTITY(1,1)'; //Particular name for inline sequences in this generator
     var $sequence_only = false; //To avoid to output the rest of the field specs, leaving only the name and the sequence_name variable

diff --git a/lib/xmldb/classes/generators/mysql/mysql.class.php b/lib/xmldb/classes/generators/mysql/mysql.class.php
index 35650677354b927cece2431bfd720b832119a5c0..500e968ed20582116b3b924914a07b8b3cae9018 100644 (file)
--- a/lib/xmldb/classes/generators/mysql/mysql.class.php
+++ b/lib/xmldb/classes/generators/mysql/mysql.class.php
@@ -44,9 +44,14 @@ class XMLDBmysql extends XMLDBGenerator {
     var $unique_keys = false; // Does the generator build unique key
     var $foreign_keys = false; // Does the generator build foreign keys
 
-    var $primary_index = false;// Does the generator need to build one index for primary keys
-    var $unique_index = true;  // Does the generator need to build one index for unique keys
-    var $foreign_index = true;  // Does the generator need to build one index for foreign keys
+    var $drop_primary_key = 'ALTER TABLE TABLENAME DROP KEYTYPE KEYNAME'; // Template to drop PKs
+                // with automatic replace for TABLENAME, KEYTYPE and KEYNAME
+
+    var $drop_unique_key = 'ALTER TABLE TABLENAME DROP KEYTYPE KEYNAME'; // Template to drop UKs
+                // with automatic replace for TABLENAME, KEYTYPE and KEYNAME
+
+    var $drop_foreign_key = 'ALTER TABLE TABLENAME DROP KEYTYPE KEYNAME'; // Template to drop FKs
+                // with automatic replace for TABLENAME, KEYTYPE and KEYNAME
 
     var $sequence_extra_code = false; //Does the generator need to add extra code to generate the sequence fields
     var $sequence_name = 'auto_increment'; //Particular name for inline sequences in this generator

diff --git a/lib/xmldb/classes/generators/oci8po/oci8po.class.php b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
index 3fc39dda089dcfd2c3bbb86da9c68d8494608646..192bf41f8de3a8ca0ebb33f34577e9dac0321021 100644 (file)
--- a/lib/xmldb/classes/generators/oci8po/oci8po.class.php
+++ b/lib/xmldb/classes/generators/oci8po/oci8po.class.php
@@ -49,10 +49,6 @@ class XMLDBoci8po extends XMLDBgenerator {
     var $unique_keys = false; // Does the generator build unique keys
     var $foreign_keys = false; // Does the generator build foreign keys
 
-    var $primary_index = false;// Does the generator need to build one index for primary keys
-    var $unique_index = true;  // Does the generator need to build one index for unique keys
-    var $foreign_index = true; // Does the generator need to build one index for foreign keys
-
     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
 

diff --git a/lib/xmldb/classes/generators/postgres7/postgres7.class.php b/lib/xmldb/classes/generators/postgres7/postgres7.class.php
index c2c7ceb7c6a5c79a0f6fd1bbdcff6138fa2d756d..54f78b679e1b1f79323b8fff5fa6e25d124fb431 100644 (file)
--- a/lib/xmldb/classes/generators/postgres7/postgres7.class.php
+++ b/lib/xmldb/classes/generators/postgres7/postgres7.class.php
@@ -40,10 +40,6 @@ class XMLDBpostgres7 extends XMLDBgenerator {
     var $unique_keys = false; // Does the generator build unique keys
     var $foreign_keys = false; // Does the generator build foreign keys
 
-    var $primary_index = false;// Does the generator need to build one index for primary keys
-    var $unique_index = true;  // Does the generator need to build one index for unique keys
-    var $foreign_index = true; // Does the generator need to build one index for foreign keys
-
     var $sequence_extra_code = false; //Does the generator need to add extra code to generate the sequence fields
     var $sequence_name = 'BIGSERIAL'; //Particular name for inline sequences in this generator
     var $sequence_only = true; //To avoid to output the rest of the field specs, leaving only the name and the sequence_name variable