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
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