Commit graph

1043 commits

Author SHA1 Message Date
José Lorenzo Rodríguez Urdaneta
fdf91194a6 Initial approach for model associations lazy loading, all model tests passing 2010-07-14 16:58:12 -04:30
José Lorenzo Rodríguez Urdaneta
62bc184506 Fixing ModelWrite Test 2010-07-13 21:42:07 -04:30
mark_story
e382a1c63c Adding test case for find(list) with recursive. 2010-07-11 18:38:27 -04:00
mark_story
65efd675c1 Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873 2010-07-11 13:06:33 -04:00
mark_story
4cd43553b4 Fixing issues where multiple reset bindModel() calls would cause incorrect associations to be restored.
Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
2010-07-03 18:05:14 -04:00
mark_story
17a7a96ba2 Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868 2010-07-01 12:39:50 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
a166ea78cb Fixing fails in dbo source test caused by not enough fixtures being loaded. 2010-06-25 23:40:29 -04:00
José Lorenzo Rodríguez Urdaneta
72c7c3f44e Completing migration of ModelIntegration test case to phpunit 2010-06-24 00:52:43 -04:30
Juan Basso
2a4489cdf2 Naming conventions to datasources with plugins. Fixes #819 2010-06-20 23:53:54 -03:00
mark_story
aee1c5483b Renaming test case classes to better reflect the filenames. 2010-06-13 10:06:00 -04:00
José Lorenzo Rodríguez
d35e02a1e1 Sending correct patch for previous commit 2010-06-10 00:02:45 -04:30
José Lorenzo Rodríguez
1b9eb035fd Migrating DboMyqli to phpunit 2010-06-09 23:00:35 -04:30
José Lorenzo Rodríguez
0a3e27b000 Migrating DboPostgres to phpunit 2010-06-09 22:52:28 -04:30
José Lorenzo Rodríguez
b3d9de1a97 Improving migration of DboMysqlTest to phpunit 2010-06-09 21:19:25 -04:30
José Lorenzo Rodríguez
a8328f3872 Migrating DboMysqlTest to PHPUnit 2010-06-09 21:03:46 -04:30
José Lorenzo Rodríguez
9b3df1ea0e Migrating DboSourceTest to PHPUnit 2010-06-09 20:47:25 -04:30
mark_story
ad8b70cec2 Removing continue statement that did nothing.
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
mark_story
2f527cc5af Adding a few tests for DboSource::fullTableName(); 2010-06-08 23:29:40 -04:00
mark_story
d0309d0c18 Fixing access violations in DbAcl test case. 2010-06-07 23:47:48 -04:00
José Lorenzo Rodríguez
bd7ce3804e Migrating CakeSchemaTest to PHPUnit 2010-06-07 00:05:40 -04:30
José Lorenzo Rodríguez
e381be7a85 Migrating AclBehaviorTest to PHPUnit 2010-06-06 23:34:34 -04:30
José Lorenzo Rodríguez
0aff378be8 Migrating TreeBehaviorTest to phpunit 2010-06-05 00:35:31 -04:30
José Lorenzo Rodríguez
d951e4a218 Migrating TranslateBehaviorTest to phpunit 2010-06-05 00:10:01 -04:30
José Lorenzo Rodríguez
fd4db4184a Migrated ConnectionManager to phpunit 2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
94dd8a2543 Migrating ModelBehaviorTest to phpunit 2010-06-04 23:27:28 -04:30
José Lorenzo Rodríguez
d04278cb8e Migrating ModelIntegrationTest to PHPUnit 2010-06-04 23:19:33 -04:30
José Lorenzo Rodríguez
c23fe5d72e Migrating ModelReadTest to PHPUnit 2010-06-04 23:07:29 -04:30
mark_story
bd6e16be26 Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789 2010-06-03 23:20:37 -04:00
José Lorenzo Rodríguez
2e7d2d5587 Migrating ModelWriteTest to phpunit 2010-06-02 00:30:52 -04:30
José Lorenzo Rodríguez
7d6ac7585a Migrating ModelValidationTest to phpunit 2010-06-01 00:19:11 -04:30
José Lorenzo Rodríguez
375dde87dc Migrating ModelDeleteTest to phpunit 2010-05-31 23:50:03 -04:30
mark_story
7ed67e5959 Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768 2010-05-30 20:30:58 -04:00
mark_story
c98a82c61c Fixing whitespace. 2010-05-30 20:28:00 -04:00
mark_story
66a8890f4f Fixing code formatting in test cases. 2010-05-30 12:51:48 -04:00
renan.saddam
c96d074722 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-05-29 12:23:04 -03:00
renan.saddam
8f5112b8d7 Changing break; to continue; so it will process the next tables on the array, tests added. 2010-05-29 12:22:16 -03:00
Martin Radosta
64adfacd3e Making DboSource::order() accept an expression object. Fixes issues with
sql parsing over quoting special SQL syntax. Tests added.  Fixes #747

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-25 23:07:29 -04:00
mark_story
29f2223c6d Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730 2010-05-22 00:58:54 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
Mark Story
79839c07d2 Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 2010-05-11 23:08:14 -04:00
Mark Story
0648c6604b Adding some additional tests for possible php4 compatibility issues. 2010-05-11 23:01:40 -04:00
Mark Story
6add43a4bc Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 2010-05-11 22:40:56 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
745afe888b Adding more tests for saving records with nulls. Closes #675 2010-05-07 22:23:18 -04:00
Mark Story
f152181c03 Adding tests for saving models with id == null. Closes #675 2010-05-06 22:24:11 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
f86d0de5ee Adding test to show correct functioning of containable + field() + recursive = -1. Closes #409 2010-04-19 23:16:59 -04:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
José Lorenzo Rodríguez
9d2819970d Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564 2010-04-13 01:08:31 -04:30
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
José Lorenzo Rodríguez
7668894888 Fixing error introduced by previous commit 2010-04-07 09:51:29 -04:30
predominant
e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5 Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379 2010-04-05 21:50:28 -04:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
José Lorenzo Rodríguez
45ccba5d94 Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524 2010-04-04 13:24:39 -04:30
predominant
3c2e7a091d Changed access to private __associations on Model to associations() calls. 2010-04-04 18:17:43 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
José Lorenzo Rodríguez
75900883e6 Making DboPostgres::value() return NULL when given an empty array, as DboMysql does 2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb Using value() in default value generation with CakeSchema and DboPostgres 2010-03-29 23:50:40 -04:30
Mark Story
068631ebe2 Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added. 2010-03-28 16:59:24 -04:00
ADmad
d365fafe4d Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false 2010-03-28 05:29:42 +05:30
Mark Story
0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
José Lorenzo Rodríguez
41734503a6 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Supporting Model.* syntax on postgres.
  Changing variable $title to $title_for_layout. Closes #511

Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500 Qouting fields inside postgres functions when prepended a DISTINCT, closes #512 2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d Supporting Model.* syntax on postgres. 2010-03-25 17:33:34 -03:00
ADmad
6a723bb515 Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477 2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
0f876e1a1b Merge branch 'saveAll' into 1.3
* saveAll:
  Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430 Making saveAll() behave like plain save() when suplied empty data array, closes #277 2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
28cb57a92c Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520 Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
c51f4076f7 Forcing order on find('all') in test. It is not safe to asume returned row order in postgres 2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
201a952218 Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table 2010-03-16 15:12:27 -04:30
AD7six
0c951b7248 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
661fcd32ab Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields. 2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81 Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459 2010-03-15 22:55:14 -04:00
Mark Story
3ab687043e Updating DboPostgres test to reflect changes in test suite. 2010-03-14 19:27:36 -04:00
Mariano Iglesias
1120d0daff Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642 Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:34:57 -03:00
Mark Story
c059cf5175 Implementing cacheMethod(). Helps to solve #458, as it provides features to control and clear method caches. 2010-03-13 22:55:18 -05:00
Mark Story
028668b7a6 Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450 2010-03-13 00:18:51 -05:00
Dieter Plaetinck
9a9bc3643b fix typo in DboPostgresTestDb::testOrderAdditionalParams() 2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time 2010-03-09 16:09:16 -04:30
José Lorenzo Rodríguez
acccf964a5 Fixing some tests for Postgres Dbo and adding test cverage for extra params in order function, closes #353 2010-03-09 15:24:03 -04:30
Mark Story
e6664f0ea4 Fixing SQL errors when running model_behavior tests with postgresql. Fixes #406 2010-03-07 19:02:19 -05:00
Mark Story
1ae922cea1 Fixing missing reference operators in test cases. 2010-03-05 22:06:20 -05:00
José Lorenzo Rodríguez
e4a5ca528c Fixing virutal fields fetching for postgresql, closes #417 2010-03-05 16:07:59 -04:30
Mark Story
2a19a8d5e4 Updating CakeSchema test so it runs in both solo and group contexts. Changing table used on TestPluginComment to match its name. 2010-02-28 13:31:23 -05:00
Mark Story
ec5d9729b0 Model::find(first) no longer uses the id set in a model as the default conditions. Fixes #266 2010-02-27 11:32:29 -05:00
Mark Story
0960abcfb9 Removing workaround code for PHP 5.3.0. Error is no longer being generated in PHP 5.3.1 2010-02-27 11:26:16 -05:00
Mark Story
7075aa5e86 Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323 2010-02-20 11:42:17 -05:00
Juan Basso
416abed211 Test of ticket #323.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-02-20 11:35:54 -05:00
Mark Story
6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
renan.saddam
63f7900ba1 Checking if the last query returned a error, tests added. Fixes #72. 2010-02-17 22:31:00 -03:00
Mark Story
2279b1a736 Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297 2010-02-16 22:35:16 -05:00
renan.saddam
d7b49e3494 Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324. 2010-02-15 14:46:18 -03:00
Mark Story
0ce14ceb7e Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307 2010-02-11 22:03:43 -05:00
Mark Story
887ddb9575 Adding tests for deletion of multiple habtm associations. Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records. Fixes #247 2010-01-29 11:55:18 -05:00
Juan Basso
57997e770c Refactory of DboSource::name() to improve performance. Added more tests to it.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-27 12:24:06 -05:00
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Mark Story
c195d654b3 Fixing TranslateBehavior test to run in php4. 2010-01-26 11:00:37 -05:00
Mark Story
5fcbc33a75 Adding tests for CURRENT_TIMESTAMP to DboSource. 2010-01-25 12:25:14 -05:00
José Lorenzo Rodríguez
03200440ed Fixing TranslateBehavior and $tablePrefix. Closes #168 2010-01-24 18:27:08 -04:30
Mark Story
5d35fd8d38 Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250 2010-01-22 10:30:22 -05:00
Mark Story
913450daef Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208 2010-01-21 10:35:20 -05:00
ADmad
570c9e5304 Cleaning up commented and unneeded test cases and moving tests to more appropriate file 2010-01-21 01:42:54 +05:30
Mark Story
e1b0c41254 Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220 2010-01-19 09:22:13 -05:00
Mark Story
9f8e0e163e Removing getTests included by accident. 2010-01-18 21:59:18 -05:00
Mark Story
080e34718d Minor refactor, and adding tests from previous commit. Fixes #208 2010-01-18 21:57:03 -05:00
Mark Story
5203397a6a Adding error expectation to model_write test. Models using useTable = false, will still issue count queries to their datasources when exists() is called. 2010-01-16 20:24:27 -05:00
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
371ac3971a Fixing php4 compatibility in model_read test. 2010-01-14 23:38:24 -05:00
Mark Story
8f2a4a1e0e Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a Trimming trailing whitespace from files. Refs #201 2010-01-14 20:15:54 -05:00
Joël Perras
adb0c809a0 Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199.
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
José Lorenzo Rodríguez
04562982b2 Fixing doc block 2010-01-11 15:34:16 -04:30
José Lorenzo Rodríguez
aa9258cbd1 Adding test for DboSource::group() and virtual fields
Closes #184
2010-01-11 12:22:59 -04:30
Phally
bbb105fc8c Added virtual field support for GROUP BY. 2010-01-11 11:46:59 -04:30
Mark Story
4ada5b7eea Fixing notice errors caused by incorrect datatyping in php4. 2010-01-11 09:44:51 -05:00
Mark Story
3c88d81735 Adding tests for model method validation with multiple parameters and addition of original validation rule to method params. Closes #149 2010-01-01 23:34:11 -05:00
Mark Story
7a620b62b0 Merge branch '1.3-misc' into mergers
Conflicts:
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
Mark Story
22cf13b6b6 Updating DboSource test to remove protected access and use methods instead. 2009-12-19 19:54:49 -05:00
Mark Story
4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
Mark Story
a89fcba243 Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
18c878b3f5 More whitespace fixes. 2009-12-18 19:18:23 -05:00
Mark Story
ab21855efd Fixing whitespacing. 2009-12-18 19:16:10 -05:00
Mark Story
959befb6e1 Merge commit 'josezap/virtual-fields' into virtual-fields 2009-12-18 19:11:50 -05:00
José Lorenzo Rodríguez
98e7575c5a Adding documentation on tests 2009-12-17 14:50:36 -04:30
José Lorenzo Rodríguez
8f29f59c1a Enclosing virtual fields in parentheses to avoid SQL errors
Added new tests to improve  code coverage on virtual fields
2009-12-17 14:42:46 -04:30
Mark Story
b190e462b8 Fixing whitespacing. 2009-12-17 00:15:42 -05:00
Mark Story
a490e249fa Adding test for validation of with models canceling a save.
Adding initial implementation of Model::__validateWithModel().

Correcting error in previous commit.  Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -05:00
Mark Story
02330b2d9c Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
Tests added
Fixes #66
2009-12-13 15:52:07 -05:00
José Lorenzo Rodríguez
c65e2f3f18 Quoting virtual fields in automatically
Updating test cases
2009-12-10 20:46:55 -04:30
José Lorenzo Rodríguez
8c4cad86c2 Fixing erroris due to bad rebase 2009-12-10 20:35:24 -04:30
José Lorenzo Rodríguez
e7ee5e9eda Fixing faling test case 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
7a7d0de988 Adding support for virtual fields in DboSourse::calculate 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
d06ff5d10a Adding support for virtual fields in conditions array 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
051d352eab Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster) 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
7efafc685e Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
a81edb6080 Extending virtual fields implementation to work on queries with field list 2009-12-10 20:07:46 -04:30
José Lorenzo Rodríguez
53765312df Initial implementation of model virtual fields 2009-12-10 20:07:07 -04:30
José Lorenzo Rodríguez
ec672e99e8 Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
00c0bb4d62 Extending virtual fields implementation to work on queries with field list 2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
19c91f1f70 Initial implementation of model virtual fields 2009-12-10 20:01:58 -04:30
predominant
df151395c5 Moving certain datasources to the Datasources Plugin (http://github.com/cakephp/datasources) 2009-12-11 01:07:23 +11:00
predominant
c64389006d Removing "Long description for file" from /cake/tests tree. 2009-12-08 20:19:42 +11:00
mark_story
1f5c6eac2e Fixing issues in tests caused by overwritten columns.
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920 Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/text.php
	cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
cc750d15f1 Adding test to disprove #385. Proves saveAll with validate => first behaves correctly. 2009-12-04 14:39:12 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
mark_story
6c3bcdd7e6 Removing commented code. 2009-11-22 17:34:11 -05:00
Juan Basso
71df8dbbba Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
mark_story
d302ed1bfa Fixing comment block formatting. 2009-11-13 09:44:51 -05:00
mark_story
2c5fa171e0 Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-11-12 14:48:03 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
6db91b0f49 Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253 2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5 Test to prove ticket #253 2009-11-07 11:02:43 -05:00
predominant
884490f1a1 Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
e609875754 Updating Model::invalidFields, so returning false from beforeValidate() will abort both the validation and saving() of the record.
Tests added to check beforeSave, beforeValidate, and beforeDelete return values.
Fixes #257
2009-11-04 12:36:17 -05:00
mark_story
dc07a05fca Merge branch '1.3' into 1.3-misc 2009-11-04 09:20:21 -05:00
tPl0ch
f5ca3ace1f Modified Model::find() to make Model::findQueryType available in Model callbacks. Fixes https://trac.cakephp.org/ticket/5847. Tests added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-04 09:16:04 -05:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
5f1e6ba6a0 Making DboSource::fetchAll return $this->_result if it is a boolean and $out is empty. Allows for Model::query() to return boolean values for operations that do not return recordsets. Fixes #6404 2009-10-29 20:31:29 -04:00
mark_story
aa03756238 Updating tests to expand coverage of buildcolumn. 2009-10-29 09:26:23 -04:00
mark_story
23831546b5 Adding valid options for sqlite collation. Tests added. 2009-10-29 02:03:50 -04:00
mark_story
a33457155f Adding valid option checking to fieldParameters.
Test case added.
2009-10-29 02:03:21 -04:00
mark_story
2a8858e928 Adding tests to DboSqlite::buildColumn
Adding collate field parameter to DboSqlite.
Removing duplicated code from DboSource, adding parent call instead.
2009-10-29 01:36:15 -04:00
mark_story
5a093e5627 Fixing issues in postgres with time columns and '' values.
Tests added.
Fixes #213
2009-10-27 13:22:34 -04:00
mark_story
79fdd8b341 Adding test to ensure blob integrity. Disproves #199 2009-10-24 12:53:22 -04:00
mark_story
14bd47842c Removing length() from DboMysqli, fixes incorrect float length parsing.
Test case added.
2009-10-24 11:06:27 -04:00
mark_story
0e23fdfbb3 Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
Test cases added.
Fixes #188
2009-10-21 00:22:36 -04:00
mark_story
3922f136da Making DboMysqlTest pass when a connection with a prefix is used. Fixes #185 2009-10-19 20:54:02 -04:00
mark_story
a36c2ec5bb Removing self inclusions for test cases. Refs #174 2009-10-16 09:21:33 -04:00
mark_story
3a85197f25 Removing self inclusions for test cases. Refs #174 2009-10-16 09:19:23 -04:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
f2cba2f066 Updating model_write.test to not use removed validation constants. 2009-10-13 00:44:28 -04:00
mark_story
3bf94e6a28 Updating documentation for Model methods to improve api parsing.
Removing redundant include.
2009-10-05 20:42:37 -04:00
mark_story
ace784aab5 Adding conditional check for errors only generated in PHP5.3 2009-10-04 22:22:39 -04:00
mark_story
0ba93bd579 Updating file headers, reformatting comments. 2009-10-04 22:12:13 -04:00
mark_story
d2bf31f69f Fixing broken tests in dbo_mysql caused by changes in CakeSchema.
Adding tableParameter altering to DboMysql.
Tests added.
2009-10-04 21:48:20 -04:00
mark_story
778755c2b0 Implementing CakeSchema:;_compareTableParameters. Adding tests for tableParameter comparison. 2009-10-04 20:53:49 -04:00
mark_story
aae120a81a Updating file headers. 2009-10-04 13:35:11 -04:00
mark_story
05f6099def Enabling plugin.name schema file creation and addition.
Making CakeSchema::load() use plugin parameter, tests added.
Plugin schema file added to test_app.
2009-10-04 13:32:33 -04:00
mark_story
76a88fc477 Updating help() for Schema shell. 2009-10-04 10:04:48 -04:00
mark_story
2fe877e527 Adding method to compare tableParameters in the Schema, so they no longer fall through as fields. 2009-10-03 16:48:10 -04:00
mark_story
236a679b17 Updating tests for schema. Making tests more reliable for schema read. 2009-10-03 16:08:54 -04:00
mark_story
e733c569be Fixing broken tests. 2009-10-03 12:44:49 -04:00
mark_story
0029a275bd Refactoring code into a separate method. Will allow code reuse in fixture generation. Tests added. 2009-10-03 12:41:14 -04:00
mark_story
71aa460a48 Continuing work on getting plugin support for CakeSchema and SchemaShell. Applied patch from 'SkieDr', test cases added. 2009-10-03 11:48:02 -04:00
mark_story
32d5b40cd0 Adding error triggering while in debug mode for unhandled validation methods. 2009-09-30 22:34:29 -04:00
mark_story
4094f0a696 Moving DboMysql::listDetailedSources() and DboMysql::getCharsetName() into DboMysqlBase so it works with mysqli as well. Tests added for MySqli. 2009-09-30 00:39:32 -04:00
mark_story
6dbba17d1b Fixing issues with DboSource::execute() where queries would not be run if stats = false in the options. Tests added. 2009-09-30 00:37:06 -04:00
SkieDr
627eff5f24 Implementation of table level and field level parameters support 2009-09-29 22:54:48 +04:00
SkieDr
a445a12020 Implement tests for new dbo source methods for additional table and field parameters support 2009-09-29 22:54:36 +04:00
mark_story
bcb5e42aab Adding test for previous commit. 2009-09-28 18:11:04 -04:00
jperras
c2ec96067a Refactoring ConnectionManager & tests. 2009-09-25 11:08:34 -04:00
jperras
c3cd98af42 Implementing loading datasources from plugins. 2009-09-24 22:56:02 -04:00
jperras
4bf5244073 Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource(). 2009-09-24 16:26:56 -04:00
jperras
ed74653d72 Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource(). 2009-09-24 16:23:39 -04:00
mark_story
d5376e64aa Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261 2009-09-19 01:17:20 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
4b4f3b1b82 Removing deprecated methods from test cases. 2009-09-16 00:33:29 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
nate
fd6538fc72 Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-09-10 09:28:55 -04:00
jperras
c48d9794f6 Fixing incorrect optional parameters passed to TreeBehavior::children() in TreeBehavior test case. Fixes errors & test failures when running under PHP 5.3. 2009-09-09 21:15:22 -04:00
jperras
5a432c6f71 Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69. 2009-09-09 00:00:53 -04:00
mark_story
11ceae2e96 Merge branch '1.3' into 1.3-logging 2009-09-07 22:41:31 -04:00
jperras
2484179e36 DboMssql::value() now returns NULL for numeric column types (float, integer, binary) when the column data is empty. Fixes #28. 2009-09-06 13:57:24 -04:00
AD7six
e47316e74f Correcting App::import usage 2009-09-04 11:58:20 -07:00
renan.saddam
0e9007e060 Making sure we are not making non-uniques and non-primary keys index. Also changing basic fixture schema to make tests pass. 2009-09-02 22:07:58 -03:00
mark_story
c0a19ced14 Adding DboSource::getLog() and test case. 2009-09-01 23:23:47 -04:00
mark_story
1bedd8418b Merge branch '1.3-deprecation' into 1.3-misc 2009-08-31 23:41:41 -04:00
mark_story
3dc12cb6da Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases. 2009-08-31 23:40:47 -04:00
mark_story
c19c1a7828 Fixing issues with cakeError call.
Adding tests for cakeError being called with non-existant Behaviors.
2009-08-30 19:33:21 -04:00
mark_story
cca3281f8c Fixing complex expression handling in DboSource::fields(). Making AS a variable controlled by implementing dbo.
Test cases added.
Fixes #38
2009-08-19 13:03:36 -04:00
gwoo
6775e0997e Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
mark_story
303b488bc1 fixing doc block indentation.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8279 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 18:13:46 +00:00