tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4454 from tractorcow/pulls/3.2/dbid-semver

Browse Source 
BUG Fix semver violation in create_table_options
This commit is contained in:
Daniel Hensby 2015-07-30 11:11:33 +01:00
commit 4373c8716b
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
model/connect/MySQLSchemaManager.php
View File

@ -12,25 +12,13 @@ class MySQLSchemaManager extends DBSchemaManager {
* Identifier for this schema, used for configuring schema-specific table * Identifier for this schema, used for configuring schema-specific table
* creation options * creation options
*/ */
const ID = 'MySQL'; const ID = 'MySQLDatabase';
public function createTable($table, $fields = null, $indexes = null, $options = null, $advancedOptions = null) { public function createTable($table, $fields = null, $indexes = null, $options = null, $advancedOptions = null) {
$fieldSchemas = $indexSchemas = ""; $fieldSchemas = $indexSchemas = "";
if (!empty($options[self::ID])) { if (!empty($options[self::ID])) {
$addOptions = $options[self::ID]; $addOptions = $options[self::ID];
} elseif (!empty($options[get_class($this)])) {
Deprecation::notice(
'3.2',
'Use MySQLSchemaManager::ID for referencing mysql-specific table creation options'
);
$addOptions = $options[get_class($this)];
} elseif (!empty($options[get_parent_class($this)])) {
Deprecation::notice(
'3.2',
'Use MySQLSchemaManager::ID for referencing mysql-specific table creation options'
);
$addOptions = $options[get_parent_class($this)];
} else { } else {
$addOptions = "ENGINE=InnoDB"; $addOptions = "ENGINE=InnoDB";
} }