Implementing listSources for postgres

cakephp · Oct 18, 2010 · 5c87daf · 5c87daf
1 parent aedf69d
commit 5c87daf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -161,16 +161,16 @@ function listSources() {
 		}
 
 		$schema = $this->config['schema'];
-		$sql = "SELECT table_name as name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '{$schema}';";
-		$result = $this->fetchAll($sql, false);
+		$sql = "SELECT table_name as name FROM INFORMATION_SCHEMA.tables WHERE table_schema = ?";
+		$result = $this->_execute($sql, array($schema));
 
 		if (!$result) {
 			return array();
 		} else {
 			$tables = array();
 
 			foreach ($result as $item) {
-				$tables[] = $item[0]['name'];
+				$tables[] = $item->Name;
 			}
 
 			parent::listSources($tables);

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -427,7 +427,7 @@ function testLastInsertIdMultipleInsert() {
 
 		$db2 = clone $db1;
 		$db2->connect();
-		$this->assertNotEqual($db1->connection, $db2->connection);
+		$this->assertNotSame($db1->getConnection(), $db2->getConnection());
 
 		$table = $db1->fullTableName('users', false);
 		$password = '5f4dcc3b5aa765d61d8327deb882cf99';