Commit graph

524 commits

Author SHA1 Message Date
Joël Perras
137704e397 Optimization to Model::save(). 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
Mark Story
7dcf66dd95 Removing dynamic calling of setTablePrefix(). tableprefix should be with the tablePrefix property, and any other custom construction behavior should be done in an overridden Model::__construct. 2010-01-02 00:07:31 -05:00
Mark Story
eab706e772 Correcting and improving doc block for Model::__construct. 2010-01-01 23:59:36 -05:00
Mark Story
026eeb645b Correcting and improving doc block for Model::__construct. 2010-01-01 23:58:07 -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
34410de7c8 Adding property definition for Model::$virtualFields 2009-12-20 16:26:12 -05:00
Mark Story
b190e462b8 Fixing whitespacing. 2009-12-17 00:15:42 -05:00
Mark Story
4ac29963a8 Refactoring Model::__validateWithModels. Should be slightly faster as loops are smaller. 2009-12-15 22:55:34 -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
José Lorenzo Rodríguez
8c4cad86c2 Fixing erroris due to bad rebase 2009-12-10 20:35:24 -04:30
José Lorenzo Rodríguez
4b9e03c9f7 Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
22e36cb057 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:08:12 -04:30
José Lorenzo Rodríguez
2503632327 Working on virtual fields on order clause. 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
0ab2078284 Changing Model::hasField() api to accept second parameter for checking existance of virtual field 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
4685daf299 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
f7a113d2b0 Convertig old-style find call to new api 2009-12-10 20:01:58 -04:30
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
be64f26f9f Updating doc blocks for model::validates. 2009-12-03 00:53:31 -05:00
mark_story
6fdaa82969 Merge branch '1.3' into 1.3-merger 2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set. 2009-11-22 21:26:25 -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
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -05:00
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit().
Updating test case.
2009-11-15 19:55:20 -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
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
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
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
e04cc81613 Updating doc block.
Removing redundant condition.
2009-10-12 23:38:55 -04:00
mark_story
2d2e692b37 Updating doc blocks to improve API parsing. 2009-10-05 21:27:34 -04:00
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
32d5b40cd0 Adding error triggering while in debug mode for unhandled validation methods. 2009-09-30 22:34:29 -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
nate
fd6538fc72 Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-09-10 09:28:55 -04:00
mark_story
046d7c75d0 Adding warnings to newly deprecated methods. 2009-08-31 22:31:36 -04:00
mark_story
bd350e95b6 Deprecating Model::bind() 2009-08-31 22:18:31 -04:00
mark_story
3cdf89dc18 Removing unused $db in Model::_deleteLinks. Fixes #6384 2009-08-30 20:09:07 -04:00
gwoo
c33437af76 updating require of overloadbale in model 2009-08-03 11:44:06 -07:00
AD7six
d61e8736e4 Merge branch '1.3' into 1.3-bake 2009-08-02 22:44:28 +02:00
gwoo
c017f80e02 Merge branch '1.2' into 1.3 2009-08-02 13:25:55 -07: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
AD7six
3b1664b7dd Preventing loading the ConnectionManager from triggering reloading the Model file 2009-07-28 08:36:55 +02:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
gwoo
986af28de0 Merge branch '1.2' into 1.3 2009-07-24 15:57:30 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02: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
gwoo
a2f0ab8b27 Merge branch '1.2' into 1.3 2009-07-20 09:31:56 -07: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
gwoo
f1a4352620 Merge branch '1.2' into 1.3 2009-07-03 08:24:42 -07: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
gwoo
3c76f173f7 removing deprecated model methods 2009-07-02 10:24:42 -07:00
gwoo
bc359259a2 Merge branch '1.2' into 1.3 2009-07-02 09:27:00 -07: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
gwoo
6f21c18366 Merge branch '1.3-lib_renames' into 1.3 2009-06-02 10:17:02 -07:00
gwoo
fdd63d4e8e Merge branch 'master' into 1.3 2009-06-02 10:12:14 -07: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
gwoo
d2667c0e6f merging master into 1.3 2009-05-04 16:06:08 -07:00
gwoo
6535e6225c merging 1.2 2009-05-04 15:57:10 -07: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
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07: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
jperras
e651c77bcf Renaming behavior.php to model_behavior.php. Modifying associated App::import calls. 2009-03-15 21:17:08 -04: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