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

BUGFIX Fixed FulltextSearchable checking DB::getConn() unncessarily for

Browse Source 
MySQL, as Database::requireTable() will only apply create_table_options
to the database adapter they're set for. Replace Object::add_static_var
usage (deprecated) with the new config system instead.
This commit is contained in:
Sean Harvey 2012-03-25 20:38:29 +13:00
parent 92b6adfcb5
commit ec02ab6f68
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search/FulltextSearchable.php
View File

@ -52,9 +52,7 @@ class FulltextSearchable extends DataExtension {
if(!class_exists($class)) continue; if(!class_exists($class)) continue;
if(isset($defaultColumns[$class])) { if(isset($defaultColumns[$class])) {
if(DB::getConn()->getDatabaseServer() == 'mysql') { Config::inst()->update($class, 'create_table_options', array('MySQLDatabase' => 'ENGINE=MyISAM'));
Object::add_static_var($class, 'create_table_options', array('MySQLDatabase' => 'ENGINE=MyISAM'), true);
}
Object::add_extension($class, "FulltextSearchable('{$defaultColumns[$class]}')"); Object::add_extension($class, "FulltextSearchable('{$defaultColumns[$class]}')");
} else { } else {
throw new Exception("FulltextSearchable::enable() I don't know the default search columns for class '$class'"); throw new Exception("FulltextSearchable::enable() I don't know the default search columns for class '$class'");