Create indexes with table creation if "IF NOT EXISTS" is on

- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>

libraries/config.default.php

@@ -1965,7 +1965,7 @@
  * of VIEWs and the stand-in table
  * @global boolean $cfg['Export']['sql_if_not_exists']
  */
-$cfg['Export']['sql_if_not_exists'] = true;
+$cfg['Export']['sql_if_not_exists'] = false;
 
 /**
  *
@@ -3142,5 +3142,3 @@
     'internal' => 50500,
     'human' => '5.5.0'
 );
-
-

libraries/config/messages.inc.php

@@ -203,7 +203,7 @@
 $strConfigExport_sql_create_trigger_name
     = sprintf(__('Add %s'), 'CREATE TRIGGER');
 $strConfigExport_sql_hex_for_binary_name = __('Use hexadecimal for BINARY & BLOB');
-$strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
+$strConfigExport_sql_if_not_exists_name = __('Add IF NOT EXISTS (less efficient)');
 $strConfigExport_sql_ignore_name = __('Use ignore inserts');
 $strConfigExport_sql_include_comments_name = __('Comments');
 $strConfigExport_sql_insert_syntax_name = __('Syntax to use when inserting data');
@@ -998,4 +998,3 @@
     . 'configuration storage tables automatically.'
 );
 $strConfigZeroConf_name = __('Enable Zero Configuration mode');
-

libraries/plugins/export/ExportSql.class.php

@@ -274,7 +274,7 @@ protected function setProperties()
 
                 $leaf = new BoolPropertyItem();
                 $leaf->setName('if_not_exists');
-                $leaf->setText('<code>IF NOT EXISTS</code>');
+                $leaf->setText('<code>IF NOT EXISTS</code> ' . __('(less efficient)'));
                 $subgroup_create_table->addProperty($leaf);
 
                 $leaf = new BoolPropertyItem();
@@ -1607,23 +1607,27 @@ public function getTableDef(
                         // constraints).
                         if ($field->key->type === 'FULLTEXT KEY') {
                             $indexes_fulltext[] = $field->build($field);
-                        } else {
+                            unset($statement->fields[$key]);
+                        } else if (empty($GLOBALS['sql_if_not_exists'])) {
                             $indexes[] = $field->build($field);
+                            unset($statement->fields[$key]);
                         }
-                        unset($statement->fields[$key]);
                     }
 
                     // Creating the parts that drop foreign keys.
                     if (!empty($field->key)) {
                         if ($field->key->type === 'FOREIGN KEY') {
                             $dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name);
+                            unset($statement->fields[$key]);
                         }
-                        unset($statement->fields[$key]);
                     }
 
                     // Dropping AUTO_INCREMENT.
                     if (!empty($field->options)) {
-                        if ($field->options->has('AUTO_INCREMENT')) {
+                        if ($field->options->has('AUTO_INCREMENT')
+                            && empty($GLOBALS['sql_if_not_exists'])
+                        ) {
+
                             $auto_increment[] = $field::build($field);
                             $field->options->remove('AUTO_INCREMENT');
                         }
@@ -1712,7 +1716,9 @@ public function getTableDef(
 
                 // Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE`
                 // too.
-                if (!empty($statement->entityOptions)) {
+                if (!empty($statement->entityOptions)
+                    && empty($GLOBALS['sql_if_not_exists'])
+                ) {
                     $statement->entityOptions->remove('AUTO_INCREMENT');
                 }