Commit graph

417 commits

Author SHA1 Message Date
mark_story
a99d2ea821 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
Conflicts:
	cake/libs/model/model.php
2009-10-05 21:02:41 -04:00
mark_story
51e471427a Updating doc blocks to improve parsing in the API. 2009-10-05 21:01:31 -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
3cdf89dc18 Removing unused $db in Model::_deleteLinks. Fixes #6384 2009-08-30 20:09:07 -04:00
jperras
3f46bf9568 Updating doc block for Model::invalidate. Fixes #4583.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8274 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 19:18:54 +00:00
gwoo
30281d6c59 fixes #6506, notice on 5.2.10 for habtm save with empty value
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8251 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 19:28:46 +00:00
mark_story
fb6b16c467 Fixing empty time value handling in Model::deconstruct(). Both null and 00:00:00 are valid values now. Test cases added and refactored. Fixes #6488, #6018, Refs #5659
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8225 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-08 03:25:30 +00:00
mark_story
45a51ed809 Changing return of Model::deleteAll(). When no records are matched by the delete conditions return is now (bool)true as no records matching those conditions exist.
Test case added.
Fixes #6453

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8216 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:26:58 +00:00
mark_story
6a34c9ef31 Fixing Model::saveAll() PHP4 compatibility. Minor API change in __save(). __save() no longer takes a model instance as the first parameter. Because of Model implementation details in PHP4 this caused broken references. Fixes #6389, #6223
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8204 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-27 15:25:07 +00:00
gwoo
88e0cfa2f8 fixes #6427, default datasource not loaded when ds is specified
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 21:35:21 +00:00
jperras
d2b4995e43 Updating Model::deconstruct to handle db expressions correctly. Fixes #6372; thanks to mattcurry for the patch.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8185 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:23:15 +00:00
mark_story
41f32d8cee Updating doc block for Model::beforeDelete(). Fixes #6219
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8174 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:20:47 +00:00
nate
8369a8f2d8 Sanitizing path in Dispatcher::baseUrl(), fixes #6336, misc. whitespace fixes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8165 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:36:22 +00:00
jperras
8bb11e49d7 Fixing counterCache behavior when updating an existing record's counterScope value. Thanks for the patch, mattcurry. Fixes #6270.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8155 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:17:21 +00:00
gwoo
fd0c39fcc6 fixes #6293, Deleting non-existing record causes save() to fail. Thanks to msadouni for the patch and test!
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8150 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:47:34 +00:00
gwoo
0cc3d5149f fixes #6277, relaxing character length comparison for UUID
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8149 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:05:13 +00:00
jperras
066629d566 Removing hard-coded 'id' field from Model::_prepareUpdateFields. Fixes #6274.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8139 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-13 14:15:58 +00:00
renan.saddam
76e0f17dbc Updating documentation to improve code completion
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8114 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 21:10:28 +00:00
gwoo
de5907326e fixes #6203, Model::invalidFields respecting Model::whitelist
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8113 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 18:19:12 +00:00
mark_story
1497fddf80 Applying patch from 'rafaelbandeira3' fixing formatting of generated code to better follow cake coding standards. Fixes #5754
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8082 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 18:05:18 +00:00
mark_story
62ea98bdb2 Fixing minor typo in model.php. Closes #6176
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8080 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 16:20:11 +00:00
gwoo
7dc627dd19 refs #4119, another check for binary uuid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8074 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-04 01:36:53 +00:00
gwoo
088815834e fixes #4119, refs #6151 binary uuid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8070 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 16:33:17 +00:00
mark_story
b1b67c811c Applying patch from 'ralph.marchildon' Fixes saving habtm data using 'with' data. Fixes #6077
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8021 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-11 03:53:04 +00:00
mark_story
1895f1c3be Fixing saveAll() when used in conjunction with belongsTo data and validate => first. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8010 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-25 23:48:28 +00:00
mark_story
1111829e99 Fixing issue in __saveMulti() where unique was not always honoured. Thanks for the patch 'Jafinto'. Tests added. Closes #6006
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8001 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 04:09:44 +00:00
gwoo
c53c28760f closes #5968, refs #5798, reverts [7893], when dependent is true, conditions are not respected on HABTM associations when deleting parent record. [7893] would result in orphaned records. If more fine grained control is needed, create a model for the join table and handle it on an application/applicaiton basis.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7988 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:01:01 +00:00
mark_story
94b9bcae89 Fixing habtm with uuid join tables with an auto model. Tests & model classes added. model test runs slightly more smoothly on postgres as well. Fixes #5940
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7966 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-30 16:09:25 +00:00
mark_story
b063f22f31 Fixing habtm joins for tables with two uuid fields, no primary key and a defined join model. Adding fixtures.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7953 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-23 23:28:08 +00:00
nate
8eade1adb3 Fixing code formatting to wrap at 100 characters, adding fix for ticket #5596, counterCache now decrements properly when foreign key value changes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7927 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:13:45 +00:00
phpnut
0d3ea7a5f2 Adding fix when join table does not have a primary key 'id' defined
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7918 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-12 17:19:27 +00:00
mariano.iglesias
da39ce77b9 Fixing order of associated results on test that was making a test to fail. Fixing issue where HABTM conditions were not being taken into account when deleting links. Adding tests, fixes #5798
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7893 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-26 14:15:51 +00:00
mark_story
8759f4ae28 Fixing reset of Model::__exists when create() is called. Test added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7878 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-19 15:53:41 +00:00
mark_story
6806b895cb Fixing merging of actsAs and _findMethods from PluginAppModel classes. Adding test cases and necessary test classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7875 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 20:24:27 +00:00
gwoo
d5b21b68a5 reverting changes to model from [7857], start/endQuote added to datasource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7860 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-10 19:53:04 +00:00
gwoo
aed9872ce2 removing startQuote/endQuote from Model::getColumnType() closes #5719
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7857 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-10 16:16:36 +00:00
TommyO
6dc11420ee Field type improperly and unnecessarily checked for HABTM inserts. Fixes #5718
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7855 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 20:55:51 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
john
989f9f0cbc Removing method no longer in use.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7811 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-31 19:06:05 +00:00
john
89bf77ae01 Updating docblock wording and @link ties.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7810 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-31 19:05:30 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
gwoo
53296d975c adding patch for model text committed in [7799]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7800 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 00:11:32 +00:00
gwoo
6624d41ecd updating habtm save handling, fixes #5579
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7795 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 07:19:26 +00:00
mark_story
ee8ff1d5ac Fixing HABTM saving with saveAll(). Tests added. Fixes #4389
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7789 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 00:22:52 +00:00
mark_story
5a2db7a5b4 Fixing interaction between Model::_clearCache() and CacheHelper. Cached view files for camelCased controller or underscored URL's were not being cleared. Fixes #5611
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7783 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 18:51:38 +00:00
mark_story
b3a6a06f80 Applying patch from 'BrendonCoz'. Model::deconstruct() now allows null for time column types. Closes #5659
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7782 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 15:02:01 +00:00
phpnut
d3896854f5 Adding fix for join table using UUID's as the primary key.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7775 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 13:29:32 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
mark_story
c2fee87b63 Added patch from 'shirsch' to fix Model::deleteAll() not returning a boolean value when callbacks = true. Updated test. Closes #5546
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7769 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-22 02:37:05 +00:00
phpnut
f51ae718e6 Closes #5607, Configure::store can no longer be uses statically.
Corrected test cases to call Configure statically.
Added fixes for tests added in [7741]
Closes #5594, Related models should be built when $useTable = false;

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7748 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-15 17:30:08 +00:00