diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php index 591eeba3e3a..8c5722762e3 100644 --- a/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php @@ -443,7 +443,8 @@ function buildIndex($indexes, $table = null) { } else { $value['column'] = $this->name($value['column']); } - $out .= "INDEX {$name} ON {$table}({$value['column']});"; + $t = trim($table, '"'); + $out .= "INDEX {$t}_{$name} ON {$table}({$value['column']});"; $join[] = $out; } return $join; diff --git a/cake/tests/cases/libs/all_database.test.php b/cake/tests/cases/libs/all_database.test.php index 39aa816acbf..8c4fc024a9a 100644 --- a/cake/tests/cases/libs/all_database.test.php +++ b/cake/tests/cases/libs/all_database.test.php @@ -37,14 +37,14 @@ public static function suite() { $suite = new PHPUnit_Framework_TestSuite('Datasources, Schema and DbAcl tests'); $path = CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS; - $tasks = array( 'db_acl', 'cake_schema', 'connection_manager', 'datasources' . DS . 'dbo_source', 'datasources' . DS . 'dbo' . DS . 'dbo_mysql', - 'datasources' . DS . 'dbo' . DS . 'dbo_postgres' + 'datasources' . DS . 'dbo' . DS . 'dbo_postgres', + 'datasources' . DS . 'dbo' . DS . 'dbo_sqlite' ); foreach ($tasks as $task) { $suite->addTestFile($path . $task . '.test.php');