From 188ff4737d3a13eeb9ed9f87ba0b29dc389be4a5 Mon Sep 17 00:00:00 2001 From: nate Date: Thu, 10 Jan 2008 07:02:33 +0000 Subject: [PATCH] Removing database-generated primary keys from fixture data, fixed primary key handling in schema generation git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6354 3807eeeb-6ff5-0310-8944-8be069107fe0 --- app/config/sql/db_acl.php | 6 +-- app/config/sql/i18n.php | 2 +- .../libs/templates/skel/config/sql/db_acl.php | 6 +-- .../libs/templates/skel/config/sql/i18n.php | 2 +- cake/libs/model/datasources/dbo/dbo_db2.php | 39 ++++++++------- .../model/datasources/dbo/dbo_firebird.php | 2 +- cake/libs/model/datasources/dbo/dbo_mssql.php | 25 +++------- cake/libs/model/datasources/dbo/dbo_mysql.php | 2 +- .../libs/model/datasources/dbo/dbo_mysqli.php | 40 ++++++++------- cake/libs/model/datasources/dbo_source.php | 4 +- cake/libs/view/helper.php | 3 +- cake/tests/fixtures/aco_fixture.php | 18 +++---- cake/tests/fixtures/advertisement_fixture.php | 4 +- .../fixtures/another_article_fixture.php | 6 +-- cake/tests/fixtures/apple_fixture.php | 14 +++--- .../fixtures/article_featured_fixture.php | 6 +-- cake/tests/fixtures/article_fixture.php | 6 +-- cake/tests/fixtures/attachment_fixture.php | 2 +- cake/tests/fixtures/auth_user_fixture.php | 10 ++-- cake/tests/fixtures/author_fixture.php | 8 +-- cake/tests/fixtures/bid_fixture.php | 10 ++-- cake/tests/fixtures/category_fixture.php | 12 ++--- .../fixtures/category_thread_fixture.php | 14 +++--- cake/tests/fixtures/comment_fixture.php | 12 ++--- cake/tests/fixtures/device_fixture.php | 6 +-- .../fixtures/device_type_category_fixture.php | 2 +- cake/tests/fixtures/device_type_fixture.php | 2 +- .../fixtures/document_directory_fixture.php | 2 +- cake/tests/fixtures/document_fixture.php | 2 +- .../exterior_type_category_fixture.php | 2 +- cake/tests/fixtures/feature_set_fixture.php | 2 +- cake/tests/fixtures/featured_fixture.php | 4 +- cake/tests/fixtures/home_fixture.php | 4 +- cake/tests/fixtures/image_fixture.php | 10 ++-- cake/tests/fixtures/item_fixture.php | 12 ++--- .../fixtures/items_portfolio_fixture.php | 12 ++--- cake/tests/fixtures/join_a_b_fixture.php | 8 +-- cake/tests/fixtures/join_a_c_fixture.php | 8 +-- cake/tests/fixtures/join_a_fixture.php | 6 +-- cake/tests/fixtures/join_b_fixture.php | 6 +-- cake/tests/fixtures/join_c_fixture.php | 6 +-- cake/tests/fixtures/join_thing_fixture.php | 8 +-- cake/tests/fixtures/message_fixture.php | 8 +-- cake/tests/fixtures/number_tree_fixture.php | 14 +++--- cake/tests/fixtures/portfolio_fixture.php | 8 +-- cake/tests/fixtures/post_fixture.php | 8 +-- cake/tests/fixtures/primary_model_fixture.php | 4 +- cake/tests/fixtures/project_fixture.php | 8 +-- cake/tests/fixtures/sample_fixture.php | 10 ++-- .../fixtures/secondary_model_fixture.php | 4 +- .../tests/fixtures/something_else_fixture.php | 6 +-- cake/tests/fixtures/something_fixture.php | 6 +-- cake/tests/fixtures/syfile_fixture.php | 15 +++--- cake/tests/fixtures/tag_fixture.php | 8 +-- cake/tests/fixtures/thread_fixture.php | 8 +-- cake/tests/fixtures/translate_fixture.php | 49 ++++++++++--------- .../fixtures/translate_table_fixture.php | 8 +-- .../fixtures/translated_item_fixture.php | 13 +++-- cake/tests/fixtures/user_fixture.php | 10 ++-- 59 files changed, 275 insertions(+), 267 deletions(-) diff --git a/app/config/sql/db_acl.php b/app/config/sql/db_acl.php index 2e4c5e5fa..7fe902387 100644 --- a/app/config/sql/db_acl.php +++ b/app/config/sql/db_acl.php @@ -45,7 +45,7 @@ class DbAclSchema extends CakeSchema { } var $acos = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), 'model' => array('type'=>'string', 'null' => true), 'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), @@ -56,7 +56,7 @@ class DbAclSchema extends CakeSchema { ); var $aros = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), 'model' => array('type'=>'string', 'null' => true), 'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), @@ -67,7 +67,7 @@ class DbAclSchema extends CakeSchema { ); var $aros_acos = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'), 'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10), '_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2), diff --git a/app/config/sql/i18n.php b/app/config/sql/i18n.php index c750e2bc2..4e8511866 100644 --- a/app/config/sql/i18n.php +++ b/app/config/sql/i18n.php @@ -45,7 +45,7 @@ class i18nSchema extends CakeSchema { } var $i18n = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'), 'model' => array('type'=>'string', 'null' => false, 'key' => 'index'), 'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'), diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.php b/cake/console/libs/templates/skel/config/sql/db_acl.php index 2e4c5e5fa..7fe902387 100644 --- a/cake/console/libs/templates/skel/config/sql/db_acl.php +++ b/cake/console/libs/templates/skel/config/sql/db_acl.php @@ -45,7 +45,7 @@ class DbAclSchema extends CakeSchema { } var $acos = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), 'model' => array('type'=>'string', 'null' => true), 'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), @@ -56,7 +56,7 @@ class DbAclSchema extends CakeSchema { ); var $aros = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), 'model' => array('type'=>'string', 'null' => true), 'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), @@ -67,7 +67,7 @@ class DbAclSchema extends CakeSchema { ); var $aros_acos = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'), 'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10), '_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2), diff --git a/cake/console/libs/templates/skel/config/sql/i18n.php b/cake/console/libs/templates/skel/config/sql/i18n.php index c750e2bc2..4e8511866 100644 --- a/cake/console/libs/templates/skel/config/sql/i18n.php +++ b/cake/console/libs/templates/skel/config/sql/i18n.php @@ -45,7 +45,7 @@ class i18nSchema extends CakeSchema { } var $i18n = array( - 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary', 'extra' => 'auto_increment'), + 'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'), 'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'), 'model' => array('type'=>'string', 'null' => false, 'key' => 'index'), 'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'), diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php index 90e0951c8..f51e9fae8 100644 --- a/cake/libs/model/datasources/dbo/dbo_db2.php +++ b/cake/libs/model/datasources/dbo/dbo_db2.php @@ -64,17 +64,17 @@ class DboDb2 extends DboSource { * @var array */ var $_baseConfig = array( - 'persistent' => true, - 'login' => 'db2inst1', - 'password' => '', - 'database' => 'cake', - 'schema' => '', - 'connect' => 'db2_pconnect', - 'hostname' => '127.0.0.1', - 'port' => '50001', - 'encoding' => 'UTF-8', - 'cataloged' => true, - 'autocommit' => true); + 'persistent' => true, + 'login' => 'db2inst1', + 'password' => '', + 'database' => 'cake', + 'schema' => '', + 'hostname' => '127.0.0.1', + 'port' => '50001', + 'encoding' => 'UTF-8', + 'cataloged' => true, + 'autocommit' => true + ); /** * An array that maps Cake column types to database native column types. * The mapped information can include a reference to a function that should @@ -84,7 +84,7 @@ class DboDb2 extends DboSource { * @var array */ var $columns = array( - 'primary_key' => array('name' => 'integer not null generated by default as identity (start with 1, increment by 1)'), + 'primary_key' => array('name' => 'not null generated by default as identity (start with 1, increment by 1)'), 'string' => array('name' => 'varchar', 'limit' => '255'), 'text' => array('name' => 'clob'), 'integer' => array('name' => 'integer', 'limit' => '10', 'formatter' => 'intval'), @@ -94,7 +94,8 @@ class DboDb2 extends DboSource { 'time' => array('name' => 'time', 'format' => 'H.i.s', 'formatter' => 'date'), 'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'), 'binary' => array('name' => 'blob'), - 'boolean' => array('name' => 'smallint', 'limit' => '1')); + 'boolean' => array('name' => 'smallint', 'limit' => '1') + ); /** * A map for every result mapping tables to columns * @@ -108,7 +109,10 @@ class DboDb2 extends DboSource { */ function connect() { $config = $this->config; - $connect = $config['connect']; + $connect = 'db2_connect'; + if ($config['persistent']) { + $connect = 'db2_pconnect'; + } $this->connected = false; if ($config['cataloged']) { @@ -120,8 +124,8 @@ class DboDb2 extends DboSource { $config['hostname'], $config['port'], $config['login'], - $config['password']); - + $config['password'] + ); $this->connection = db2_connect($conn_string, '', ''); } @@ -132,7 +136,6 @@ class DboDb2 extends DboSource { if ($config['schema'] !== '') { $this->_execute('SET CURRENT SCHEMA = ' . $config['schema']); } - return $this->connected; } /** @@ -225,7 +228,7 @@ class DboDb2 extends DboSource { 'null' => db2_result($result, 'NULLABLE'), 'default' => db2_result($result, 'COLUMN_DEF'), 'length' => db2_result($result, 'COLUMN_SIZE') - ); + ); } $this->__cacheDescription($model->tablePrefix . $model->table, $fields); return $fields; diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php index cd7066e23..5f5fd9ab8 100644 --- a/cake/libs/model/datasources/dbo/dbo_firebird.php +++ b/cake/libs/model/datasources/dbo/dbo_firebird.php @@ -97,7 +97,7 @@ class DboFirebird extends DboSource { * @var array */ var $columns = array( - 'primary_key' => array('name' => 'integer IDENTITY (1, 1) NOT NULL'), + 'primary_key' => array('name' => 'IDENTITY (1, 1) NOT NULL'), 'string' => array('name' => 'varchar', 'limit' => '255'), 'text' => array('name' => 'BLOB SUB_TYPE 1 SEGMENT SIZE 100 CHARACTER SET NONE'), 'integer' => array('name' => 'integer'), diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php index f71cd852d..1fae64532 100644 --- a/cake/libs/model/datasources/dbo/dbo_mssql.php +++ b/cake/libs/model/datasources/dbo/dbo_mssql.php @@ -80,11 +80,11 @@ class DboMssql extends DboSource { * @var array */ var $columns = array( - 'primary_key' => array('name' => 'int IDENTITY (1, 1) NOT NULL'), + 'primary_key' => array('name' => 'IDENTITY (1, 1) NOT NULL'), 'string' => array('name' => 'varchar', 'limit' => '255'), 'text' => array('name' => 'text'), 'integer' => array('name' => 'int', 'formatter' => 'intval'), - 'float' => array('name' => 'float', 'formatter' => 'floatval'), + 'float' => array('name' => 'numeric', 'formatter' => 'floatval'), 'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), 'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), 'time' => array('name' => 'datetime', 'format' => 'H:i:s', 'formatter' => 'date'), @@ -122,10 +122,6 @@ class DboMssql extends DboSource { } else { $sep = ':'; } - $connect = 'mssql_connect'; - if ($config['persistent']) { - $connect = 'mssql_pconnect'; - } $this->connected = false; if (is_numeric($config['port'])) { @@ -136,15 +132,16 @@ class DboMssql extends DboSource { $port = '\\' . $config['port']; // Named pipe } - if (!$config['persistent'] || (isset($config['connect']) && $config['connect'] === 'mssql_connect')) { - $this->connection = $connect($config['host'] . $port, $config['login'], $config['password'], true); + if (!$config['persistent']) { + $this->connection = mssql_connect($config['host'] . $port, $config['login'], $config['password'], true); } else { - $this->connection = $connect($config['host'] . $port, $config['login'], $config['password']); + $this->connection = mssql_pconnect($config['host'] . $port, $config['login'], $config['password']); } if (mssql_select_db($config['database'], $this->connection)) { $this->connected = true; } + return $this->connected; } /** * Disconnects from database. @@ -451,28 +448,22 @@ class DboMssql extends DboSource { if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) { return $col; } - if ($col == 'bit') { return 'boolean'; } - - if (strpos($col, 'int') !== false || $col == 'numeric') { + if (strpos($col, 'int') !== false) { return 'integer'; } - if (strpos($col, 'char') !== false) { return 'string'; } - if (strpos($col, 'text') !== false) { return 'text'; } - if (strpos($col, 'binary') !== false || $col == 'image') { return 'binary'; } - - if (in_array($col, array('float', 'real', 'decimal'))) { + if (in_array($col, array('float', 'real', 'decimal', 'numeric'))) { return 'float'; } return 'text'; diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index 879c6793e..c4c714cef 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -74,7 +74,7 @@ class DboMysql extends DboSource { * @var array */ var $columns = array( - 'primary_key' => array('name' => 'int(11) DEFAULT NULL auto_increment'), + 'primary_key' => array('name' => 'NOT NULL AUTO_INCREMENT'), 'string' => array('name' => 'varchar', 'limit' => '255'), 'text' => array('name' => 'text'), 'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'), diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php index 0a5655b63..669215b01 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysqli.php +++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php @@ -59,29 +59,33 @@ class DboMysqli extends DboSource { * * @var array */ - var $_baseConfig = array('persistent' => true, - 'host' => 'localhost', - 'login' => 'root', - 'password' => '', - 'database' => 'cake', - 'port' => '3306', - 'connect' => 'mysqli_connect'); + var $_baseConfig = array( + 'persistent' => true, + 'host' => 'localhost', + 'login' => 'root', + 'password' => '', + 'database' => 'cake', + 'port' => '3306', + 'connect' => 'mysqli_connect' + ); /** * Mysqli column definition * * @var array */ - var $columns = array('primary_key' => array('name' => 'int(11) DEFAULT NULL auto_increment'), - 'string' => array('name' => 'varchar', 'limit' => '255'), - 'text' => array('name' => 'text'), - 'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'), - 'float' => array('name' => 'float', 'formatter' => 'floatval'), - 'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), - 'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), - 'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'), - 'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'), - 'binary' => array('name' => 'blob'), - 'boolean' => array('name' => 'tinyint', 'limit' => '1')); + var $columns = array( + 'primary_key' => array('name' => 'DEFAULT NULL auto_increment'), + 'string' => array('name' => 'varchar', 'limit' => '255'), + 'text' => array('name' => 'text'), + 'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'), + 'float' => array('name' => 'float', 'formatter' => 'floatval'), + 'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), + 'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'), + 'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'), + 'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'), + 'binary' => array('name' => 'blob'), + 'boolean' => array('name' => 'tinyint', 'limit' => '1') + ); /** * Connects to the database using options in the given configuration array. * diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index e609cd5cf..0d1913a35 100644 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -2081,8 +2081,8 @@ class DboSource extends DataSource { } $out .= '(' . $length . ')'; } - if (isset($column['key']) && $column['key'] == 'primary' && (isset($column['extra']) && $column['extra'] == 'auto_increment')) { - $out .= ' NOT NULL AUTO_INCREMENT'; + if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') { + $out .= ' ' . $this->columns['primary_key']['name']; } elseif (isset($column['key']) && $column['key'] == 'primary') { $out .= ' NOT NULL'; } elseif (isset($column['default']) && isset($column['null']) && $column['null'] == false) { diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index c34d6d705..9fa964cba 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -664,7 +664,8 @@ class Helper extends Overloadable { function afterLayout() { } /** - * Enter description here... + * Transforms a recordset from a hasAndBelongsToMany association to a list of selected + * options for a multiple select element * * @param mixed $data * @param string $key diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php index a83ed31a6..271a3ce78 100644 --- a/cake/tests/fixtures/aco_fixture.php +++ b/cake/tests/fixtures/aco_fixture.php @@ -45,15 +45,15 @@ class AcoFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 18), - array('id' => 2, 'parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller1', 'lft' => 2, 'rght' => 9), - array('id' => 3, 'parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 3, 'rght' => 6), - array('id' => 4, 'parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 4, 'rght' => 5), - array('id' => 5, 'parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 7, 'rght' => 8), - array('id' => 6, 'parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller2', 'lft' => 10, 'rght' => 17), - array('id' => 7, 'parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 11, 'rght' => 14), - array('id' => 8, 'parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 12, 'rght' => 13), - array('id' => 9, 'parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 15, 'rght' => 16), + array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 18), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller1', 'lft' => 2, 'rght' => 9), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 3, 'rght' => 6), + array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 4, 'rght' => 5), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 7, 'rght' => 8), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller2', 'lft' => 10, 'rght' => 17), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 11, 'rght' => 14), + array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 12, 'rght' => 13), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 15, 'rght' => 16), ); } diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php index 93c9f8203..9f4503130 100644 --- a/cake/tests/fixtures/advertisement_fixture.php +++ b/cake/tests/fixtures/advertisement_fixture.php @@ -41,8 +41,8 @@ class AdvertisementFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'title' => 'First Ad', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'title' => 'Second Ad', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') + array('title' => 'First Ad', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('title' => 'Second Ad', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') ); } diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php index 1c393a0ef..6ebaf3d48 100644 --- a/cake/tests/fixtures/another_article_fixture.php +++ b/cake/tests/fixtures/another_article_fixture.php @@ -41,9 +41,9 @@ class AnotherArticleFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'title' => 'First Article', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'title' => 'Second Article', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array ('id' => 3, 'title' => 'Third Article', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('title' => 'First Article', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('title' => 'Second Article', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('title' => 'Third Article', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php index c3d9af2d8..5e0461973 100644 --- a/cake/tests/fixtures/apple_fixture.php +++ b/cake/tests/fixtures/apple_fixture.php @@ -45,13 +45,13 @@ class AppleFixture extends CakeTestFixture { 'mytime' => 'time' ); var $records = array( - array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'), - array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'), - array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'), - array('id' => 6, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'), - array('id' => 7, 'apple_id' => 7, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'), - array('id' => 8, 'apple_id' => 6, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'), - array('id' => 9, 'apple_id' => 8, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17') + array('apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'), + array('apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'), + array('apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'), + array('apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'), + array('apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'), + array('apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'), + array('apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17') ); } diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php index 11092cad7..5a0bd2435 100644 --- a/cake/tests/fixtures/article_featured_fixture.php +++ b/cake/tests/fixtures/article_featured_fixture.php @@ -44,9 +44,9 @@ class ArticleFeaturedFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array ('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php index 873c63280..ca55912ac 100644 --- a/cake/tests/fixtures/article_fixture.php +++ b/cake/tests/fixtures/article_fixture.php @@ -44,9 +44,9 @@ class ArticleFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array ('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php index 740b4859a..764f44825 100644 --- a/cake/tests/fixtures/attachment_fixture.php +++ b/cake/tests/fixtures/attachment_fixture.php @@ -42,7 +42,7 @@ class AttachmentFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31') + array('comment_id' => 5, 'attachment' => 'attachment.zip', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31') ); } diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php index 9c3663ca1..d7bc15c37 100644 --- a/cake/tests/fixtures/auth_user_fixture.php +++ b/cake/tests/fixtures/auth_user_fixture.php @@ -42,11 +42,11 @@ class AuthUserFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'username' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), - array('id' => 2, 'username' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), - array('id' => 3, 'username' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), - array('id' => 4, 'username' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), - array('id' => 5, 'username' => 'chartjes', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), + array('username' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), + array('username' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), + array('username' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), + array('username' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), + array('username' => 'chartjes', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); } diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php index 65ba1f17c..e3ce87634 100644 --- a/cake/tests/fixtures/author_fixture.php +++ b/cake/tests/fixtures/author_fixture.php @@ -42,10 +42,10 @@ class AuthorFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), - array('id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), - array('id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), - array('id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), + array('user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), + array('user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), + array('user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), + array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); } diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php index da40ffbf3..81c7dd835 100644 --- a/cake/tests/fixtures/bid_fixture.php +++ b/cake/tests/fixtures/bid_fixture.php @@ -40,11 +40,11 @@ class BidFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'message_id' => 1, 'name' => 'Bid 1.1'), - array ('id' => 2, 'message_id' => 1, 'name' => 'Bid 1.2'), - array ('id' => 3, 'message_id' => 3, 'name' => 'Bid 3.1'), - array ('id' => 4, 'message_id' => 2, 'name' => 'Bid 2.1'), - array ('id' => 5, 'message_id' => 2, 'name' => 'Bid 2.2') + array('message_id' => 1, 'name' => 'Bid 1.1'), + array('message_id' => 1, 'name' => 'Bid 1.2'), + array('message_id' => 3, 'name' => 'Bid 3.1'), + array('message_id' => 2, 'name' => 'Bid 2.1'), + array('message_id' => 2, 'name' => 'Bid 2.2') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php index 82eae9d2c..9bf89418d 100644 --- a/cake/tests/fixtures/category_fixture.php +++ b/cake/tests/fixtures/category_fixture.php @@ -42,12 +42,12 @@ class CategoryFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 3, 'parent_id' => 1, 'name' => 'Category 1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 4, 'parent_id' => 0, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 5, 'parent_id' => 0, 'name' => 'Category 3', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 6, 'parent_id' => 5, 'name' => 'Category 3.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31') + array('parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 1, 'name' => 'Category 1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 0, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 0, 'name' => 'Category 3', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 5, 'name' => 'Category 3.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31') ); } diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php index e315e9457..c39760911 100644 --- a/cake/tests/fixtures/category_thread_fixture.php +++ b/cake/tests/fixtures/category_thread_fixture.php @@ -42,13 +42,13 @@ class CategoryThreadFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 6, 'parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), - array('id' => 7, 'parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31') + array('parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), + array('parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31') ); } diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php index 3bd812bba..b3657f29d 100644 --- a/cake/tests/fixtures/comment_fixture.php +++ b/cake/tests/fixtures/comment_fixture.php @@ -44,12 +44,12 @@ class CommentFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'), - array('id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'), - array('id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'), - array('id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'), - array('id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'), - array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31') + array('article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'), + array('article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'), + array('article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'), + array('article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'), + array('article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'), + array('article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31') ); } diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php index 30d35f932..f8f5a5aa2 100644 --- a/cake/tests/fixtures/device_fixture.php +++ b/cake/tests/fixtures/device_fixture.php @@ -41,9 +41,9 @@ class DeviceFixture extends CakeTestFixture { 'typ' => array('type' => 'integer', 'null' => false), ); var $records = array( - array('id' => 1, 'device_type_id' => 1, 'name' => 'Device 1', 'typ' => 1), - array('id' => 2, 'device_type_id' => 1, 'name' => 'Device 2', 'typ' => 1), - array('id' => 3, 'device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2) + array('device_type_id' => 1, 'name' => 'Device 1', 'typ' => 1), + array('device_type_id' => 1, 'name' => 'Device 2', 'typ' => 1), + array('device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2) ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php index 76cbddb2c..c5fa88c9c 100644 --- a/cake/tests/fixtures/device_type_category_fixture.php +++ b/cake/tests/fixtures/device_type_category_fixture.php @@ -39,7 +39,7 @@ class DeviceTypeCategoryFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'name' => 'DeviceTypeCategory 1') + array('name' => 'DeviceTypeCategory 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php index 1ad7b6d34..c63422ff2 100644 --- a/cake/tests/fixtures/device_type_fixture.php +++ b/cake/tests/fixtures/device_type_fixture.php @@ -46,7 +46,7 @@ class DeviceTypeFixture extends CakeTestFixture { 'order' => array('type' => 'integer', 'null' => false) ); var $records = array( - array('id' => 1, 'device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0) + array('device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0) ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php index 054401671..cc1a08107 100644 --- a/cake/tests/fixtures/document_directory_fixture.php +++ b/cake/tests/fixtures/document_directory_fixture.php @@ -39,7 +39,7 @@ class DocumentDirectoryFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'name' => 'DocumentDirectory 1') + array('name' => 'DocumentDirectory 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php index 5e3b1928b..6169079d5 100644 --- a/cake/tests/fixtures/document_fixture.php +++ b/cake/tests/fixtures/document_fixture.php @@ -40,7 +40,7 @@ class DocumentFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'document_directory_id' => 1, 'name' => 'Document 1') + array('document_directory_id' => 1, 'name' => 'Document 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php index e6d560401..6e85c23f5 100644 --- a/cake/tests/fixtures/exterior_type_category_fixture.php +++ b/cake/tests/fixtures/exterior_type_category_fixture.php @@ -40,7 +40,7 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'image_id' => 1, 'name' => 'ExteriorTypeCategory 1') + array('image_id' => 1, 'name' => 'ExteriorTypeCategory 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php index a06cec31c..7134e2565 100644 --- a/cake/tests/fixtures/feature_set_fixture.php +++ b/cake/tests/fixtures/feature_set_fixture.php @@ -39,7 +39,7 @@ class FeatureSetFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'name' => 'FeatureSet 1') + array('name' => 'FeatureSet 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php index b1fff3dff..3729becd6 100644 --- a/cake/tests/fixtures/featured_fixture.php +++ b/cake/tests/fixtures/featured_fixture.php @@ -44,8 +44,8 @@ class FeaturedFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), ); } diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php index ba448511f..8e7c6f5a8 100644 --- a/cake/tests/fixtures/home_fixture.php +++ b/cake/tests/fixtures/home_fixture.php @@ -43,8 +43,8 @@ class HomeFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array ('id' => 1, 'another_article_id' => 1, 'advertisement_id' => 1, 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array ('id' => 2, 'another_article_id' => 3, 'advertisement_id' => 1, 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') + array('another_article_id' => 1, 'advertisement_id' => 1, 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('another_article_id' => 3, 'advertisement_id' => 1, 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') ); } diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php index 4dfcd6e23..b0ba21a8a 100644 --- a/cake/tests/fixtures/image_fixture.php +++ b/cake/tests/fixtures/image_fixture.php @@ -39,11 +39,11 @@ class ImageFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'name' => 'Image 1'), - array ('id' => 2, 'name' => 'Image 2'), - array ('id' => 3, 'name' => 'Image 3'), - array ('id' => 4, 'name' => 'Image 4'), - array ('id' => 5, 'name' => 'Image 5') + array('name' => 'Image 1'), + array('name' => 'Image 2'), + array('name' => 'Image 3'), + array('name' => 'Image 4'), + array('name' => 'Image 5') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php index 54e05710e..7c3042546 100644 --- a/cake/tests/fixtures/item_fixture.php +++ b/cake/tests/fixtures/item_fixture.php @@ -40,12 +40,12 @@ class ItemFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array('id' => 1, 'syfile_id' => 1, 'name' => 'Item 1'), - array('id' => 2, 'syfile_id' => 2, 'name' => 'Item 2'), - array('id' => 3, 'syfile_id' => 3, 'name' => 'Item 3'), - array('id' => 4, 'syfile_id' => 4, 'name' => 'Item 4'), - array('id' => 5, 'syfile_id' => 5, 'name' => 'Item 5'), - array('id' => 6, 'syfile_id' => 6, 'name' => 'Item 6') + array('syfile_id' => 1, 'name' => 'Item 1'), + array('syfile_id' => 2, 'name' => 'Item 2'), + array('syfile_id' => 3, 'name' => 'Item 3'), + array('syfile_id' => 4, 'name' => 'Item 4'), + array('syfile_id' => 5, 'name' => 'Item 5'), + array('syfile_id' => 6, 'name' => 'Item 6') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php index 8e6b32432..e29726ea3 100644 --- a/cake/tests/fixtures/items_portfolio_fixture.php +++ b/cake/tests/fixtures/items_portfolio_fixture.php @@ -40,12 +40,12 @@ class ItemsPortfolioFixture extends CakeTestFixture { 'portfolio_id' => array('type' => 'integer', 'null' => false) ); var $records = array( - array ('id' => 1, 'item_id' => 1, 'portfolio_id' => 1), - array ('id' => 2, 'item_id' => 2, 'portfolio_id' => 2), - array ('id' => 3, 'item_id' => 3, 'portfolio_id' => 1), - array ('id' => 4, 'item_id' => 4, 'portfolio_id' => 1), - array ('id' => 5, 'item_id' => 5, 'portfolio_id' => 1), - array ('id' => 6, 'item_id' => 6, 'portfolio_id' => 2) + array('item_id' => 1, 'portfolio_id' => 1), + array('item_id' => 2, 'portfolio_id' => 2), + array('item_id' => 3, 'portfolio_id' => 1), + array('item_id' => 4, 'portfolio_id' => 1), + array('item_id' => 5, 'portfolio_id' => 1), + array('item_id' => 6, 'portfolio_id' => 2) ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php index 1b885e583..0f99eabc5 100644 --- a/cake/tests/fixtures/join_a_b_fixture.php +++ b/cake/tests/fixtures/join_a_b_fixture.php @@ -35,7 +35,7 @@ class JoinABFixture extends CakeTestFixture { var $name = 'JoinAsJoinB'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'join_a_id' => array('type' => 'integer', 'length' => 10, 'null' => true), 'join_b_id' => array('type' => 'integer', 'default' => ''), 'other' => array('type' => 'string', 'default' => ''), @@ -44,9 +44,9 @@ class JoinABFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'), - array('id' => 2, 'join_a_id' => 2, 'join_b_id' => 3, 'other' => 'Data for Join A 2 Join B 3', 'created' => '2008-01-03 10:56:34', 'updated' => '2008-01-03 10:56:34'), - array('id' => 3, 'join_a_id' => 3, 'join_b_id' => 1, 'other' => 'Data for Join A 3 Join B 1', 'created' => '2008-01-03 10:56:35', 'updated' => '2008-01-03 10:56:35') + array('join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'), + array('join_a_id' => 2, 'join_b_id' => 3, 'other' => 'Data for Join A 2 Join B 3', 'created' => '2008-01-03 10:56:34', 'updated' => '2008-01-03 10:56:34'), + array('join_a_id' => 3, 'join_b_id' => 1, 'other' => 'Data for Join A 3 Join B 1', 'created' => '2008-01-03 10:56:35', 'updated' => '2008-01-03 10:56:35') ); } diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php index 115c08a74..3614bbcf3 100644 --- a/cake/tests/fixtures/join_a_c_fixture.php +++ b/cake/tests/fixtures/join_a_c_fixture.php @@ -35,7 +35,7 @@ class JoinACFixture extends CakeTestFixture { var $name = 'JoinAsJoinC'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'join_a_id' => array('type' => 'integer', 'length' => 10, 'null' => true), 'join_c_id' => array('type' => 'integer', 'default' => ''), 'other' => array('type' => 'string', 'default' => ''), @@ -44,9 +44,9 @@ class JoinACFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'join_a_id' => 1, 'join_c_id' => 2, 'other' => 'Data for Join A 1 Join C 2', 'created' => '2008-01-03 10:57:22', 'updated' => '2008-01-03 10:57:22'), - array('id' => 2, 'join_a_id' => 2, 'join_c_id' => 3, 'other' => 'Data for Join A 2 Join C 3', 'created' => '2008-01-03 10:57:23', 'updated' => '2008-01-03 10:57:23'), - array('id' => 3, 'join_a_id' => 3, 'join_c_id' => 1, 'other' => 'Data for Join A 3 Join C 1', 'created' => '2008-01-03 10:57:24', 'updated' => '2008-01-03 10:57:24') + array('join_a_id' => 1, 'join_c_id' => 2, 'other' => 'Data for Join A 1 Join C 2', 'created' => '2008-01-03 10:57:22', 'updated' => '2008-01-03 10:57:22'), + array('join_a_id' => 2, 'join_c_id' => 3, 'other' => 'Data for Join A 2 Join C 3', 'created' => '2008-01-03 10:57:23', 'updated' => '2008-01-03 10:57:23'), + array('join_a_id' => 3, 'join_c_id' => 1, 'other' => 'Data for Join A 3 Join C 1', 'created' => '2008-01-03 10:57:24', 'updated' => '2008-01-03 10:57:24') ); } diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php index 5efae30a3..70616d483 100644 --- a/cake/tests/fixtures/join_a_fixture.php +++ b/cake/tests/fixtures/join_a_fixture.php @@ -43,9 +43,9 @@ class JoinAFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'name' => 'Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', 'updated' => '2008-01-03 10:54:23'), - array('id' => 2, 'name' => 'Join A 2', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:24', 'updated' => '2008-01-03 10:54:24'), - array('id' => 3, 'name' => 'Join A 3', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:25', 'updated' => '2008-01-03 10:54:24') + array('name' => 'Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', 'updated' => '2008-01-03 10:54:23'), + array('name' => 'Join A 2', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:24', 'updated' => '2008-01-03 10:54:24'), + array('name' => 'Join A 3', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:25', 'updated' => '2008-01-03 10:54:24') ); } diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php index 635b37a6c..78d3b5bb9 100644 --- a/cake/tests/fixtures/join_b_fixture.php +++ b/cake/tests/fixtures/join_b_fixture.php @@ -42,9 +42,9 @@ class JoinBFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'name' => 'Join B 1', 'created' => '2008-01-03 10:55:01', 'updated' => '2008-01-03 10:55:01'), - array('id' => 2, 'name' => 'Join B 2', 'created' => '2008-01-03 10:55:02', 'updated' => '2008-01-03 10:55:02'), - array('id' => 3, 'name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03') + array('name' => 'Join B 1', 'created' => '2008-01-03 10:55:01', 'updated' => '2008-01-03 10:55:01'), + array('name' => 'Join B 2', 'created' => '2008-01-03 10:55:02', 'updated' => '2008-01-03 10:55:02'), + array('name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php index da2d6379f..f0985eafc 100644 --- a/cake/tests/fixtures/join_c_fixture.php +++ b/cake/tests/fixtures/join_c_fixture.php @@ -42,9 +42,9 @@ class JoinCFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'name' => 'Join C 1', 'created' => '2008-01-03 10:56:11', 'updated' => '2008-01-03 10:56:11'), - array('id' => 2, 'name' => 'Join C 2', 'created' => '2008-01-03 10:56:12', 'updated' => '2008-01-03 10:56:12'), - array('id' => 3, 'name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13') + array('name' => 'Join C 1', 'created' => '2008-01-03 10:56:11', 'updated' => '2008-01-03 10:56:11'), + array('name' => 'Join C 2', 'created' => '2008-01-03 10:56:12', 'updated' => '2008-01-03 10:56:12'), + array('name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php index 3a772e85c..779e6a3eb 100644 --- a/cake/tests/fixtures/join_thing_fixture.php +++ b/cake/tests/fixtures/join_thing_fixture.php @@ -35,7 +35,7 @@ class JoinThingFixture extends CakeTestFixture { var $name = 'JoinThing'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'something_id' => array('type' => 'integer', 'length' => 10, 'null' => true), 'something_else_id' => array('type' => 'integer', 'default' => ''), 'doomed' => array('type' => 'boolean', 'default' => '0'), @@ -44,9 +44,9 @@ class JoinThingFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'something_id' => 1, 'something_else_id' => 2, 'doomed' => true, 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array('id' => 2, 'something_id' => 2, 'something_else_id' => 3, 'doomed' => false, 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array('id' => 3, 'something_id' => 3, 'something_else_id' => 1, 'doomed' => true, 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('something_id' => 1, 'something_else_id' => 2, 'doomed' => true, 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('something_id' => 2, 'something_else_id' => 3, 'doomed' => false, 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('something_id' => 3, 'something_else_id' => 1, 'doomed' => true, 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php index be7d45bb7..56d010e13 100644 --- a/cake/tests/fixtures/message_fixture.php +++ b/cake/tests/fixtures/message_fixture.php @@ -35,14 +35,14 @@ class MessageFixture extends CakeTestFixture { var $name = 'Message'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'thread_id' => array('type' => 'integer', 'null' => false), 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'thread_id' => 1, 'name' => 'Thread 1, Message 1'), - array ('id' => 2, 'thread_id' => 2, 'name' => 'Thread 2, Message 1'), - array ('id' => 3, 'thread_id' => 3, 'name' => 'Thread 3, Message 1') + array('thread_id' => 1, 'name' => 'Thread 1, Message 1'), + array('thread_id' => 2, 'name' => 'Thread 2, Message 1'), + array('thread_id' => 3, 'name' => 'Thread 3, Message 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php index 7706e85ef..d0f738bec 100644 --- a/cake/tests/fixtures/number_tree_fixture.php +++ b/cake/tests/fixtures/number_tree_fixture.php @@ -36,11 +36,13 @@ */ class NumberTreeFixture extends CakeTestFixture { var $name = 'NumberTree'; - var $fields = array ( 'id' => array ( - 'type' => 'integer','key' => 'primary', 'extra'=> 'auto_increment'), - 'name' => array ('type' => 'string','null' => false), - 'parent_id' => 'integer', - 'lft' => array ('type' => 'integer','null' => false), - 'rght' => array ('type' => 'integer','null' => false)); + var $fields = array( + 'id' => array('type' => 'integer','key' => 'primary'), + 'name' => array('type' => 'string','null' => false), + 'parent_id' => 'integer', + 'lft' => array('type' => 'integer','null' => false), + 'rght' => array('type' => 'integer','null' => false) + ); } + ?> \ No newline at end of file diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php index 59208e907..2d5408234 100644 --- a/cake/tests/fixtures/portfolio_fixture.php +++ b/cake/tests/fixtures/portfolio_fixture.php @@ -35,14 +35,14 @@ class PortfolioFixture extends CakeTestFixture { var $name = 'Portfolio'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'seller_id' => array('type' => 'integer', 'null' => false), 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'seller_id' => 1, 'name' => 'Portfolio 1'), - array ('id' => 2, 'seller_id' => 1, 'name' => 'Portfolio 2'), - array ('id' => 3, 'seller_id' => 2, 'name' => 'Portfolio 1') + array('seller_id' => 1, 'name' => 'Portfolio 1'), + array('seller_id' => 1, 'name' => 'Portfolio 2'), + array('seller_id' => 2, 'name' => 'Portfolio 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php index 06af1d3c9..73af70976 100644 --- a/cake/tests/fixtures/post_fixture.php +++ b/cake/tests/fixtures/post_fixture.php @@ -35,7 +35,7 @@ class PostFixture extends CakeTestFixture { var $name = 'Post'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'author_id' => array('type' => 'integer', 'null' => false), 'title' => array('type' => 'string', 'null' => false), 'body' => 'text', @@ -44,9 +44,9 @@ class PostFixture extends CakeTestFixture { 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array('id' => 2, 'author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array('id' => 3, 'author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php index 320ce9dea..bb50838d0 100644 --- a/cake/tests/fixtures/primary_model_fixture.php +++ b/cake/tests/fixtures/primary_model_fixture.php @@ -35,11 +35,11 @@ class PrimaryModelFixture extends CakeTestFixture { var $name = 'PrimaryModel'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'primary_name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'primary_name' => 'Primary Name Existing') + array('primary_name' => 'Primary Name Existing') ); } diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php index cd831c77a..e1b2bf540 100644 --- a/cake/tests/fixtures/project_fixture.php +++ b/cake/tests/fixtures/project_fixture.php @@ -35,13 +35,13 @@ class ProjectFixture extends CakeTestFixture { var $name = 'Project'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'name' => 'Project 1'), - array ('id' => 2, 'name' => 'Project 2'), - array ('id' => 3, 'name' => 'Project 3') + array('name' => 'Project 1'), + array('name' => 'Project 2'), + array('name' => 'Project 3') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php index 629cf8bde..d780de52f 100644 --- a/cake/tests/fixtures/sample_fixture.php +++ b/cake/tests/fixtures/sample_fixture.php @@ -35,14 +35,14 @@ class SampleFixture extends CakeTestFixture { var $name = 'Sample'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'apple_id' => array('type' => 'integer', 'null' => false), 'name' => array('type' => 'string', 'length' => 40, 'null' => false) ); var $records = array( - array('id' => 1, 'apple_id' => 3, 'name' => 'sample1'), - array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'), - array('id' => 3, 'apple_id' => 6, 'name' => 'sample3'), - array('id' => 4, 'apple_id' => 7, 'name' => 'sample4') + array('apple_id' => 3, 'name' => 'sample1'), + array('apple_id' => 2, 'name' => 'sample2'), + array('apple_id' => 4, 'name' => 'sample3'), + array('apple_id' => 5, 'name' => 'sample4') ); } \ No newline at end of file diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php index 07d206ac4..f6349f9ed 100644 --- a/cake/tests/fixtures/secondary_model_fixture.php +++ b/cake/tests/fixtures/secondary_model_fixture.php @@ -35,11 +35,11 @@ class SecondaryModelFixture extends CakeTestFixture { var $name = 'SecondaryModel'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'secondary_name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'secondary_name' => 'Secondary Name Existing') + array('secondary_name' => 'Secondary Name Existing') ); } diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php index 9524a03df..e8dea334e 100644 --- a/cake/tests/fixtures/something_else_fixture.php +++ b/cake/tests/fixtures/something_else_fixture.php @@ -44,9 +44,9 @@ class SomethingElseFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array('id' => 2, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array('id' => 3, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php index 2958da37d..370545ec0 100644 --- a/cake/tests/fixtures/something_fixture.php +++ b/cake/tests/fixtures/something_fixture.php @@ -44,9 +44,9 @@ class SomethingFixture extends CakeTestFixture { ); var $records = array( - array('id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), - array('id' => 2, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), - array('id' => 3, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') + array('title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), + array('title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), + array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php index 811003265..89807daf8 100644 --- a/cake/tests/fixtures/syfile_fixture.php +++ b/cake/tests/fixtures/syfile_fixture.php @@ -35,18 +35,19 @@ class SyfileFixture extends CakeTestFixture { var $name = 'Syfile'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'image_id' => array('type' => 'integer', 'null' => true), 'name' => array('type' => 'string', 'null' => false), 'item_count' => array('type' => 'integer', 'null' => true) ); var $records = array( - array('id' => 1, 'image_id' => 1, 'name' => 'Syfile 1'), - array('id' => 2, 'image_id' => 2, 'name' => 'Syfile 2'), - array('id' => 3, 'image_id' => 5, 'name' => 'Syfile 3'), - array('id' => 4, 'image_id' => 3, 'name' => 'Syfile 4'), - array('id' => 5, 'image_id' => 4, 'name' => 'Syfile 5'), - array('id' => 6, 'image_id' => null, 'name' => 'Syfile 6') + array('image_id' => 1, 'name' => 'Syfile 1'), + array('image_id' => 2, 'name' => 'Syfile 2'), + array('image_id' => 5, 'name' => 'Syfile 3'), + array('image_id' => 3, 'name' => 'Syfile 4'), + array('image_id' => 4, 'name' => 'Syfile 5'), + array('image_id' => null, 'name' => 'Syfile 6') ); } + ?> \ No newline at end of file diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php index 69b3ecbf1..79fae7456 100644 --- a/cake/tests/fixtures/tag_fixture.php +++ b/cake/tests/fixtures/tag_fixture.php @@ -35,15 +35,15 @@ class TagFixture extends CakeTestFixture { var $name = 'Tag'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'tag' => array('type' => 'string', 'null' => false), 'created' => 'datetime', 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'), - array('id' => 2, 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'), - array('id' => 3, 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31') + array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'), + array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'), + array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31') ); } diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php index d5c0cb80d..b68f038d4 100644 --- a/cake/tests/fixtures/thread_fixture.php +++ b/cake/tests/fixtures/thread_fixture.php @@ -35,14 +35,14 @@ class ThreadFixture extends CakeTestFixture { var $name = 'Thread'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'project_id' => array('type' => 'integer', 'null' => false), 'name' => array('type' => 'string', 'null' => false) ); var $records = array( - array ('id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1'), - array ('id' => 2, 'project_id' => 1, 'name' => 'Project 1, Thread 2'), - array ('id' => 3, 'project_id' => 2, 'name' => 'Project 2, Thread 1') + array('project_id' => 1, 'name' => 'Project 1, Thread 1'), + array('project_id' => 1, 'name' => 'Project 1, Thread 2'), + array('project_id' => 2, 'name' => 'Project 2, Thread 1') ); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php index 552c34391..83d16fe60 100644 --- a/cake/tests/fixtures/translate_fixture.php +++ b/cake/tests/fixtures/translate_fixture.php @@ -36,30 +36,31 @@ class TranslateFixture extends CakeTestFixture { var $name = 'Translate'; var $table = 'i18n'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), - 'locale' => array('type' => 'string', 'length' => 6, 'null' => false), - 'model' => array('type' => 'string', 'null' => false), - 'foreign_key' => array('type' => 'integer', 'null' => false), - 'field' => array('type' => 'string', 'null' => false), - 'content' => array('type' => 'text')); + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'locale' => array('type' => 'string', 'length' => 6, 'null' => false), + 'model' => array('type' => 'string', 'null' => false), + 'foreign_key' => array('type' => 'integer', 'null' => false), + 'field' => array('type' => 'string', 'null' => false), + 'content' => array('type' => 'text') + ); var $records = array( - array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'), - array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'), - array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'), - array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'), - array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'), - array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1'), - array('id' => 7, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title #2'), - array('id' => 8, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Content #2'), - array('id' => 9, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titel #2'), - array('id' => 10, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Inhalt #2'), - array('id' => 11, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titulek #2'), - array('id' => 12, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Obsah #2'), - array('id' => 13, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title #3'), - array('id' => 14, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Content #3'), - array('id' => 15, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titel #3'), - array('id' => 16, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Inhalt #3'), - array('id' => 17, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titulek #3'), - array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3')); + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'), + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1'), + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title #2'), + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Content #2'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titel #2'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Inhalt #2'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titulek #2'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Obsah #2'), + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title #3'), + array('locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Content #3'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titel #3'), + array('locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Inhalt #3'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titulek #3'), + array('locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3')); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php index de4cc3585..c0b659e86 100644 --- a/cake/tests/fixtures/translate_table_fixture.php +++ b/cake/tests/fixtures/translate_table_fixture.php @@ -36,14 +36,16 @@ class TranslateTableFixture extends CakeTestFixture { var $name = 'TranslateTable'; var $table = 'another_i18n'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'locale' => array('type' => 'string', 'length' => 6, 'null' => false), 'model' => array('type' => 'string', 'null' => false), 'foreign_key' => array('type' => 'integer', 'null' => false), 'field' => array('type' => 'string', 'null' => false), 'content' => array('type' => 'text')); var $records = array( - array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Another Title #1'), - array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Another Content #1')); + array('locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Another Title #1'), + array('locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Another Content #1') + ); } + ?> \ No newline at end of file diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php index 763ab235e..cf6cb4d1c 100644 --- a/cake/tests/fixtures/translated_item_fixture.php +++ b/cake/tests/fixtures/translated_item_fixture.php @@ -35,11 +35,14 @@ class TranslatedItemFixture extends CakeTestFixture { var $name = 'TranslatedItem'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), - 'slug' => array('type' => 'string', 'null' => false)); + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'slug' => array('type' => 'string', 'null' => false) + ); var $records = array( - array('id' => 1, 'slug' => 'first_translated'), - array('id' => 2, 'slug' => 'second_translated'), - array('id' => 3, 'slug' => 'third_translated')); + array('slug' => 'first_translated'), + array('slug' => 'second_translated'), + array('slug' => 'third_translated') + ); } + ?> \ No newline at end of file diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php index d49bfc979..cafcf6f90 100644 --- a/cake/tests/fixtures/user_fixture.php +++ b/cake/tests/fixtures/user_fixture.php @@ -35,17 +35,17 @@ class UserFixture extends CakeTestFixture { var $name = 'User'; var $fields = array( - 'id' => array('type' => 'integer', 'key' => 'primary', 'extra'=> 'auto_increment'), + 'id' => array('type' => 'integer', 'key' => 'primary'), 'user' => array('type' => 'string', 'null' => false), 'password' => array('type' => 'string', 'null' => false), 'created' => 'datetime', 'updated' => 'datetime' ); var $records = array( - array('id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), - array('id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), - array('id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), - array('id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), + array('user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), + array('user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'), + array('user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'), + array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); }