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
mark_story
686b9c2c8b
Fixing issues in alterSchema in DboMysql and DboPostgres, where fields would be appended to each table being altered.
...
Also fixed an issue in DboPostgres where the generated alter statements would contain too many ;.
Test cases added. Fixes #1023
2010-08-15 22:17:02 -04:00
mark_story
c44c276fa3
Removing ModelBehavior::dispatchMethod(), replacing with call_user_func_array() as its faster and the php4 workaround is no longer needed.
2010-08-10 23:18:39 -04:00
mark_story
409b12954b
Simplifying logic and data structures used to store enabled-ness of objects in an object collection.
2010-08-10 23:18:39 -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
c78e869be6
Removing PHP4 workarounds in BehaviorCollection.
...
Making BehaviorCollection throw exceptions instead of use cakeError.
2010-08-10 23:18:39 -04:00
mark_story
16d5b2655c
Adding a way to load helpers in a disabled state. Updating tests and subclasses.
2010-08-10 23:18:37 -04:00
mark_story
aa61a251dc
Deprecating BehaviorCollection::attach() and BehaviorCollection::detach(). load() and unload() are more generic and make sense in other contexts.
...
Adding base trigger implementation.
Adding tests for helper triggering.
2010-08-10 23:18:37 -04:00
mark_story
9fd881cb00
Moving methods down and adding some tests.
2010-08-10 23:18:36 -04:00
mark_story
6db3dbc680
Starting to create HelperCollection which will be responsible for loading and constructing helpers.
...
Making an abstract class that will be the base of all object collections.
Adding test cases.
2010-08-10 23:18:36 -04:00
mark_story
29ddffa2d3
Fixing regression in DboMysqlBase where describe() was no longer pulling out fieldParameters. A test case has been added to catch any future regressions. Fixes #991
2010-08-09 23:25:32 -04:00
Juan Basso
ae2fa908c5
Dont use private attributes as tables in CakeSchema. Fixes #7
2010-08-02 00:22:46 -03:00
mark_story
509a9e14e2
Fixing condition missing a model name in the TreeBehavior. Fixes #961
2010-07-31 14:29:00 -04:00
mark_story
2b1efafe65
Applying optimization from 'michaelc' to reduce number of strtolower() calls in AclBehavior. Fixes #972
2010-07-29 22:04:22 -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
ADmad
91b0a4ba4f
Changing Tree behavior's function names to be camel cased as per convention
2010-07-24 23:32:49 +05:30
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