Pepending table name to index generation to avoid name clashes

Finally, all tests using a Sqlite database pass
cakephp · Dec 3, 2010 · 66d0986 · 66d0986
1 parent e167271
commit 66d0986
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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');