From 569b9dd48a8d4c8995bacee7ef9a55a85c3f349c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 10 Dec 2008 03:38:10 +0000
Subject: [PATCH] Adding index() to dbo_sqlite. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7913 3807eeeb-6ff5-0310-8944-8be069107fe0
---
.../libs/model/datasources/dbo/dbo_sqlite.php | 39 +++++++++++++++-
.../model/datasources/dbo/dbo_sqlite.test.php | 46 +++++++++++++------
2 files changed, 71 insertions(+), 14 deletions(-)
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index f301be136..b51132185 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -412,7 +412,7 @@ class DboSqlite extends DboSource {
* @param integer $offset Offset from which to start results
* @return string SQL limit/offset statement
*/
- function limit ($limit, $offset = null) {
+ function limit($limit, $offset = null) {
if ($limit) {
$rt = '';
if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
@@ -529,6 +529,43 @@ class DboSqlite extends DboSource {
}
return $join;
}
+/**
+ * Overrides DboSource::index to handle SQLite indexe introspection
+ * Returns an array of the indexes in given table name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ */
+ function index(&$model) {
+ $index = array();
+ $table = $this->fullTableName($model);
+ if ($table) {
+ $indexes = $this->query('PRAGMA index_list(' . $table . ')');
+ $tableInfo = $this->query('PRAGMA table_info(' . $table . ')');
+ foreach ($indexes as $i => $info) {
+ $key = array_pop($info);
+ $keyInfo = $this->query('PRAGMA index_info("' . $key['name'] . '")');
+ foreach ($keyInfo as $keyCol) {
+ if (!isset($index[$key['name']])) {
+ $col = array();
+ if (preg_match('/autoindex/', $key['name'])) {
+ $key['name'] = 'PRIMARY';
+ }
+ $index[$key['name']]['column'] = $keyCol[0]['name'];
+ $index[$key['name']]['unique'] = intval($key['unique'] == 1);
+ } else {
+ if (!is_array($index[$key['name']]['column'])) {
+ $col[] = $index[$key['name']]['column'];
+ }
+ $col[] = $keyCol[0]['name'];
+ $index[$key['name']]['column'] = $col;
+ }
+ }
+ }
+ }
+ return $index;
+ }
+
/**
* Overrides DboSource::renderStatement to handle schema generation with SQLite-style indexes
*
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 3af15ba52..47f1acea5 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -22,15 +22,7 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
-
-if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
- define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
-}
-require_once LIBS.'model'.DS.'model.php';
-require_once LIBS.'model'.DS.'datasources'.DS.'datasource.php';
-require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
-require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_sqlite.php';
-require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
+App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
/**
* Short description for class.
@@ -153,6 +145,37 @@ class DboSqliteTest extends CakeTestCase {
$this->db->query('DROP TABLE foo_test;');
$this->assertFalse(in_array('foo_test', $this->db->listSources()));
}
+/**
+ * test Index introspection.
+ *
+ * @access public
+ * @return void
+ */
+ function testIndex() {
+ $name = $this->db->fullTableName('with_a_key');
+ $this->db->query('CREATE TABLE ' . $name . ' ("id" int(11) PRIMARY KEY, "bool" int(1), "small_char" varchar(50), "description" varchar(40) );');
+ $this->db->query('CREATE INDEX pointless_bool ON ' . $name . '("bool")');
+ $this->db->query('CREATE UNIQUE INDEX char_index ON ' . $name . '("small_char")');
+ $expected = array(
+ 'PRIMARY' => array('column' => 'id', 'unique' => 1),
+ 'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+ 'char_index' => array('column' => 'small_char', 'unique' => 1),
+
+ );
+ $result = $this->db->index($name);
+ $this->assertEqual($expected, $result);
+ $this->db->query('DROP TABLE ' . $name);
+
+ $this->db->query('CREATE TABLE ' . $name . ' ("id" int(11) PRIMARY KEY, "bool" int(1), "small_char" varchar(50), "description" varchar(40) );');
+ $this->db->query('CREATE UNIQUE INDEX multi_col ON ' . $name . '("small_char", "bool")');
+ $expected = array(
+ 'PRIMARY' => array('column' => 'id', 'unique' => 1),
+ 'multi_col' => array('column' => array('small_char', 'bool'), 'unique' => 1),
+ );
+ $result = $this->db->index($name);
+ $this->assertEqual($expected, $result);
+ $this->db->query('DROP TABLE ' . $name);
+ }
/**
* Tests that cached table descriptions are saved under the sanitized key name
@@ -176,10 +199,7 @@ class DboSqliteTest extends CakeTestCase {
$db->cacheSources = false;
$fileName = '_' . preg_replace('/[^A-Za-z0-9_\-+]/', '_', TMP . $dbName) . '_list';
-
- while (strpos($fileName, '__') !== false) {
- $fileName = str_replace('__', '_', $fileName);
- }
+
$result = Cache::read($fileName, '_cake_model_');
$this->assertEqual($result, array('test_list'));