Commit graph

1536 commits

Author SHA1 Message Date
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
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
mark_story
4c27c24a72 Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878 2010-07-15 23:17:38 -04:00
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
65efd675c1 Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873 2010-07-11 13:06:33 -04:00
mark_story
3ae1501fd0 Removing more strtolower loops. 2010-07-09 23:58:48 -04:00
mark_story
cbccd16c46 Adding visibility and static keywords to connection manager. 2010-07-05 23:08:25 -04:00
mark_story
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
mark_story
02e25f7557 Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503 2010-07-05 21:50:36 -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
mark_story
17a7a96ba2 Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868 2010-07-01 12:39:50 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
e023350af5 Updating API docs related to DboSource::$cacheMethods. Fixes #870 2010-06-30 08:52:39 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
Juan Basso
2a4489cdf2 Naming conventions to datasources with plugins. Fixes #819 2010-06-20 23:53:54 -03:00
mark_story
df3432aa86 Updating doc blocks in ModelBehavior. Refs #810 2010-06-11 09:55:39 -04:00
mark_story
e5df32e9d9 Adding omitted documentation information. 2010-06-10 14:23:49 -04:00
mark_story
ec5ad93a68 Updating doc blocks for ModelBehavior so they better reflect the actual behaviour of the methods.
Removing unused variable assignment.
Fixes #810
2010-06-10 13:54:04 -04:00
José Lorenzo Rodríguez
f4cf945e30 Migrating DboSqliteTest to phpunit 2010-06-09 23:33:41 -04:30
mark_story
ad8b70cec2 Removing continue statement that did nothing.
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
José Lorenzo Rodríguez
bd7ce3804e Migrating CakeSchemaTest to PHPUnit 2010-06-07 00:05:40 -04:30
José Lorenzo Rodríguez
fd4db4184a Migrated ConnectionManager to phpunit 2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
c23fe5d72e Migrating ModelReadTest to PHPUnit 2010-06-04 23:07:29 -04:30
mark_story
bd6e16be26 Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789 2010-06-03 23:20:37 -04:00
José Lorenzo Rodríguez
7d6ac7585a Migrating ModelValidationTest to phpunit 2010-06-01 00:19:11 -04:30
mark_story
7ed67e5959 Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768 2010-05-30 20:30:58 -04:00
mark_story
dea33f6452 Fixing pass by reference errors in php5.3. Fixes #451 2010-05-29 13:19:12 -04:00
renan.saddam
c96d074722 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-05-29 12:23:04 -03:00
renan.saddam
8f5112b8d7 Changing break; to continue; so it will process the next tables on the array, tests added. 2010-05-29 12:22:16 -03:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
predominant
f63f15812e Merge remote branch 'origin/1.3' into 1.3 2010-05-30 01:13:40 +10:00
predominant
f06f0dae8b Numerous "Enter description here" block comments updated to have meaningful descriptions. 2010-05-30 01:10:48 +10:00
Martin Radosta
64adfacd3e Making DboSource::order() accept an expression object. Fixes issues with
sql parsing over quoting special SQL syntax. Tests added.  Fixes #747

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-25 23:07:29 -04:00
Juan Basso
2d44929598 Optimization on dbo datasource to not repeat ids in find. Fixes #601
Signed-off-by: mark_story <mark@mark-story.com>
2010-05-23 17:22:55 -04:00
mark_story
29f2223c6d Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730 2010-05-22 00:58:54 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Mark Story
79839c07d2 Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 2010-05-11 23:08:14 -04:00
Mark Story
6add43a4bc Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 2010-05-11 22:40:56 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
257665eb5b Updating doc blocks for bindModel and unbindModel, explaining that associations are only reset when find() is called. Refs #652 2010-05-01 17:37:23 -04:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
Mark Story
c9f103432c Updating Model to use call_user_func_array instead of methods that were previously inherited from Object. 2010-04-23 20:47:40 -04:00
Mark Story
65ddc2b040 Fixing fatal errors caused by calling methods that no longer exist. 2010-04-23 20:45:13 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
2010-04-18 01:02:39 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
23a22c73b7 Remove "not being used" comment from Model docblock. Fixes #590 2010-04-16 21:45:44 +10:00