Commit graph

580 commits

Author SHA1 Message Date
mark_story
fd3b4b2cd5 Adding Model::hasMethod() and tests. 2010-12-26 17:35:22 -05:00
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
3c69d9b138 Making ModelBehavior beforeX callbacks default to returning true. Returning null or false from a Behavior::before method will abort the operation. It felt illogical to have null continue, but false stop. 2010-12-12 17:40:13 -05:00
mark_story
df21d19c4c Making a bunch of properties public so containable can hack around. Need to refactor and fix visibility issues.
Fixing failing tests in containable.
2010-12-12 15:48:36 -05:00
mark_story
a05baaa76e Removing BehaviorCollection::trigger() so it uses the parent method.
Updating model to use the new behaviorcollection trigger method signature.
2010-12-12 15:03:23 -05:00
José Lorenzo Rodríguez
c559b9c22d Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/console/templates/skel/config/database.php.default
	cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
José Lorenzo Rodríguez
7c4ab886e6 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-12-03 14:08:03 -04:30
José Lorenzo Rodríguez
0ff01330c4 Making dates deconstruction in model more consistent for different datasources 2010-11-27 00:13:04 -04:30
José Lorenzo Rodríguez
b6731dd9ad Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
2010-11-26 20:26:41 -04:30
mark_story
845edf38e1 Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
2010-11-25 22:51:30 -05:00
mark_story
8821bec049 Moving _mergeVars() into Object as its common to Controller, Model and Shell. 2010-11-21 00:14:29 -05:00
mark_story
e2aeae3825 Adding _mergeVars() into Model.
Refactoring how Model does its property merging.
Eventually _mergeVars() could be moved into Object.
2010-11-21 00:12:07 -05:00
mark_story
d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
e8678b38ac Adding specific conditions to model->delete's call to dbo->delete. This
helps fix a race condition where dbo->defaultConditions could cause
additional data loss.  Fixes #250
2010-11-08 21:50:45 -05:00
ADmad
eb76ab95f2 Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself. 2010-11-06 09:33:50 +05:30
José Lorenzo Rodríguez
1acb619e75 Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC 2010-10-24 19:59:54 -04:30
Juan Basso
d771239104 Fixed support to save XML data in Models. 2010-10-17 22:47:43 -02:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
c573fd0432 Fixing issue where a beforeDelete() could trigger a table truncation.
Moving the exists check below beforeDelete() and behavior->beforeDelete() so any records deleted in the callbacks will not exist when db->delete() is called.  Test updated. Fixes #250
2010-09-29 23:31:41 -04:00
mark_story
b08aba8e86 Adding a missing rollback when validation on an associated record fails, and validate = first. Fixes #1147 2010-09-28 23:37:28 -04:00
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
8cd266c77f Correcting example in doc block. Fixes #1132 2010-09-24 22:23:24 -04:00
mark_story
e4d34b640b Merge branch '2.0-exceptions' into 2.0
Conflicts:
	cake/libs/error.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/error.test.php
2010-09-10 20:31:16 -04:00
Mark Story
d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
c60edfae6d Fixing issue where errors containing code = 500, were not actually converted to error500 when debug = 0. Making missingConnection, and missingTable into error500 errors. 2010-09-06 16:46:41 -04:00
mark_story
f1164c93d6 Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery. 2010-08-29 21:37:25 -04:00
mark_story
dc67b9cacc Moving all the exceptions into one file for the short term. 2010-08-28 00:08:35 -04:00
mark_story
0683dc43ff Replacing cakeError calls with exceptions in ConnectionManager and Model. 2010-08-27 23:54:22 -04:00
mark_story
b02e213958 Adding test case from '0x20h'. Fixing issue where atomic = false, validate = first and saveAll() saving many rows could return an incorrect value. Fixes #1050 2010-08-26 22:21:39 -04:00
mark_story
5446a062ee Fixing issue where whitelist would not be used for validation. Test case added. Fixes #1037 2010-08-21 22:48:59 -04:00
mark_story
f46241a6e7 Merge branch '2.0' into 2.0-helpers 2010-08-16 23:02:44 -04:00
mark_story
705e90bef7 Merge branch '1.3' into 2.0-merge
Conflicts:
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
b2250852e4 Moving BehaviorCollection into its own file.
Changing how behaviors are stored in the collection object.  Makes it work the same as HelperCollection.
2010-08-10 23:18:39 -04:00
mark_story
d81d33ffe6 Adding some additional documentation for Model::find(). Fixes #952 2010-07-27 21:25:31 -04:00
mark_story
d38857095a Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/model/model.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
Scott Reeves
b717abe1aa Fixing typo in Constructor description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:00 -04:00
José Lorenzo Rodríguez Urdaneta
bc27d1eae4 Returning only booleans in Model::__isset() and removing return by reference in Model::getDataSource() 2010-07-15 23:17:13 -04:30
José Lorenzo Rodríguez Urdaneta
b8b4647355 Removing use of cakeError in Model and replacing it with an Exception 2010-07-15 23:11:30 -04:30
José Lorenzo Rodríguez Urdaneta
6fb930c73b Removing assignments by reference in model class 2010-07-15 22:16:19 -04:30
José Lorenzo Rodríguez Urdaneta
a57e5e8c68 Replacing direct reads to schema cache and routing them to the correct method 2010-07-15 21:19:23 -04:30
José Lorenzo Rodríguez Urdaneta
5d1e6f9e4f Fixing errors with displayField 2010-07-15 21:18:16 -04:30
José Lorenzo Rodríguez Urdaneta
a13be623b5 Making the model require database connection only wen needed or requested 2010-07-15 21:16:52 -04:30
José Lorenzo Rodríguez Urdaneta
e165f7d559 Changing how dynamic "with" models are loaded
Changing all calls to get model's datasourse to use Model::getDatasource()
2010-07-14 23:19:38 -04:30
José Lorenzo Rodríguez Urdaneta
c1a9a2e263 Correctly registering plugin models in CR, initial test case onmodel associations lazy loading 2010-07-14 19:23:41 -04:30
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