Commit graph

585 commits

Author SHA1 Message Date
José Lorenzo Rodríguez Urdaneta
96f834a7ea Various bugfixes in model associations lazy loafing for "with" associations 2010-07-14 17:54:19 -04:30
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
91c3cd8905 Refactoring Model::__createLinks to not loose the plugin name when creating the association 2010-07-13 23:28:48 -04:30
mark_story
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -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
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
José Lorenzo Rodríguez
7d6ac7585a Migrating ModelValidationTest to phpunit 2010-06-01 00:19:11 -04:30
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
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
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
257665eb5b Updating doc blocks for bindModel and unbindModel, explaining that associations are only reset when find() is called. Refs #652 2010-05-01 17:37:23 -04: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
Mark Story
c9f103432c Updating Model to use call_user_func_array instead of methods that were previously inherited from Object. 2010-04-23 20:47:40 -04:00
Mark Story
65ddc2b040 Fixing fatal errors caused by calling methods that no longer exist. 2010-04-23 20:45:13 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
2010-04-18 01:02:39 -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
predominant
23a22c73b7 Remove "not being used" comment from Model docblock. Fixes #590 2010-04-16 21:45:44 +10:00
predominant
6bd9f0f05b Convert models, datasources and file/folders to new version of translation shortcut function. 2010-04-16 02:00:25 +10:00
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
sdoney
9f601ea334 Adding/Updating @link tags pointing to cookbook sections
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-08 22:46:05 -04:00
predominant
5f2d091810 Cleanup some whitespace. 2010-04-05 16:43:47 +10:00
predominant
e0534a7a70 Remove PHP4 code from dynamic call, and change call__ to __call. 2010-04-05 16:43:20 +10:00
predominant
50a547167b Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
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
predominant
29dc12dbc2 Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
Mark Story
44b216cec3 Removing Model::$transaction as it did nothing. The property was added but never completed. Leaving the model property looking like it does something when in fact it does absolutely nothing. Refs #531 2010-04-02 13:53:53 -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
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
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
Mark Story
8375570f8a Removing useless loop in Model::save() 2010-03-15 23:36:20 -04:00
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
01a5738f3c Effectively reverting changes made in
[190066fd51] which caused conditions using
a falsey values to be removed.
2010-03-15 23:14:23 -04:00
Mark Story
190066fd51 Adding array_filter() to remove empty conditions that can be caused by array casting an empty string. 2010-03-15 22:15:03 -04: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
Mark Story
63fcd225ac Fixing doc block @link tags in Model class. 2010-03-05 22:07:39 -05:00
Dieter Plaetinck
3affec58c6 move information about return value to the correct place in the doc block of Model::saveAll()
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-05 21:47:03 -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
7daad4acaf Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00