Rename the mysql_foreign_keys option to foreign_keys

And apply it universally.
This commit is contained in:
Alexei Sorokin 2020-08-17 14:12:49 +03:00 committed by Diogo Peralta Cordeiro
parent ed68659ece
commit 1f3edd8fdf
3 changed files with 4 additions and 4 deletions

View File

@ -616,9 +616,6 @@ class MysqlSchema extends Schema
$col['type'] = $this->mapType($col); $col['type'] = $this->mapType($col);
unset($col['size']); unset($col['size']);
} }
if (!common_config('db', 'mysql_foreign_keys')) {
unset($tableDef['foreign keys']);
}
return $tableDef; return $tableDef;
} }
} }

View File

@ -1115,6 +1115,9 @@ class Schema
if (common_config('search', 'type') !== 'fulltext') { if (common_config('search', 'type') !== 'fulltext') {
unset($tableDef['fulltext indexes']); unset($tableDef['fulltext indexes']);
} }
if (!common_config('db', 'foreign_keys')) {
unset($tableDef['foreign keys']);
}
return $tableDef; return $tableDef;
} }

View File

@ -81,7 +81,7 @@ $default =
'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */ 'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
'log_queries' => false, // true to log all DB queries 'log_queries' => false, // true to log all DB queries
'log_slow_queries' => 0, // if set, log queries taking over N seconds 'log_slow_queries' => 0, // if set, log queries taking over N seconds
'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL 'foreign_keys' => false), // if set, enables foreign key support
'fix' => 'fix' =>
array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'legacy_http' => false, // set this to true if you have upgraded your site from http=>https 'legacy_http' => false, // set this to true if you have upgraded your site from http=>https