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
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
6c2b088706
Merge branch '2.0' into 2.0-view
2010-11-10 23:41:44 -05:00
José Lorenzo Rodríguez
afa5ee6885
Removing E_STRICT errors from connection manager
2010-11-08 22:37:34 -04:30
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
mark_story
3216c902cd
Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
...
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8
Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated.
2010-11-07 13:23: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
Mark Story
e6aeae8935
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:44:45 -04:00
Mark Story
a3da915abd
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:41:33 -04:00
Mark Story
08e7bcb7ab
Merge branch '1.3' into integration
...
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
mark_story
f5fd069583
Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
...
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
2010-10-27 23:03:31 -04:00
mark_story
7c296211ef
Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice.
...
Moving tests around. Fixes #1180
2010-10-20 23:17:04 -04:00
mark_story
498417203b
Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
...
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
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
d56416456c
Applying patch from 'Justas Butkus' to DboSource
...
Fixes issues where reconnect could issue warnings related to
array_merge. Fixes #1182
2010-10-11 21:52:10 -04:00
mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -04:00
mark_story
5e26d282a1
Fixing connection specific schema generation
...
Fixing missing table errors when reading schema for specific connections.
Tests updated to check that tables not on a connection are never touched. Fixes #1106
2010-09-30 23:22:57 -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
a4746c7227
Applying patch from 'kworr' to reorder the switch in DboPostgres::value() to fix issues with pgsql 9.0. Fixes #1139
2010-09-24 22:47:18 -04:00
mark_story
8cd266c77f
Correcting example in doc block. Fixes #1132
2010-09-24 22:23:24 -04:00
mark_story
729a45703b
Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121
2010-09-21 20:34:27 -04:00
mark_story
d113d7d612
Removing dead code from DboSource::fields()
...
Updating fields() to use implode, so complex virtual fields are better handled. Fixes #1079
2010-09-18 00:04:36 -04:00
mark_story
5a8648cca0
Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930
2010-09-16 00:17:09 -04:00
mark_story
730e373afe
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -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
e15069769d
Adding tests for #1079 and fixing some formatting.
2010-09-07 00:09:06 -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
464d2217e6
Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods.
2010-09-06 13:51:42 -04:00
Mark Story
5789aaf24d
Applying patch from 'tkykmw'. Behavior mapped methods are no longer run through strtolower(). Mapped methods are now case sensitive. Fixes #318
2010-09-06 13:38:01 -04:00
Mark Story
d62ae2900a
Fixing issue where ConnectionManager wasn't triggering session close, causing issues with database sessions.
2010-09-06 01:10:45 -04:00
ADmad
bfaaa6b8ba
Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995
2010-09-05 23:53:24 +05:30
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
ea9e30890f
Adding a workaround to DboSource::showLog() to work around fix added in [ da9c0da626].
...
Also adding explanation message when logs are not generated.
2010-08-26 21:24:09 -04:00
dogmatic69
95168cee6e
casting the find as an array to avoid errors with array_values() fixes #1041 and 4 failing tests (3 previous)
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-08-26 20:32:48 -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
12d4b52f10
Fixing failing tests in DboMysql and DboPostgres related to localized floats. Refs #1029
2010-08-21 00:49:40 -04:00
mark_story
f46241a6e7
Merge branch '2.0' into 2.0-helpers
2010-08-16 23:02:44 -04:00
mark_story
c4a978d386
Adding changes missed in the merge.
2010-08-15 23:10:29 -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
