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
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11: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
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
jperras
5a432c6f71
Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69 .
2009-09-09 00:00:53 -04:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
6a34c9ef31
Fixing Model::saveAll() PHP4 compatibility. Minor API change in __save(). __save() no longer takes a model instance as the first parameter. Because of Model implementation details in PHP4 this caused broken references. Fixes #6389 , #6223
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8204 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-27 15:25:07 +00:00
mark_story
b055db19f7
Increasing Model test compatibility with SQLite and Postgres
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8188 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-04 00:37:27 +00:00
mark_story
f0752feeec
Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
...
Test cases and fixtures added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
jperras
066629d566
Removing hard-coded 'id' field from Model::_prepareUpdateFields. Fixes #6274 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8139 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-13 14:15:58 +00:00
davidpersson
fd7d6718a1
Updating tests to not affect other ones when run from a group
...
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
davidpersson
3c3b852099
Changing package of tests from "cake.tests" to "cake".
...
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
renan.saddam
157ee1efbf
Removing VALID_NUMBER and VALID_NOT_EMPTY from tests, applying patch from 'jperras'. Fixes #5901
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7999 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 01:55:31 +00:00
AD7six
5af1835722
adding tests for #6003
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7995 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:40:47 +00:00
mark_story
94b9bcae89
Fixing habtm with uuid join tables with an auto model. Tests & model classes added. model test runs slightly more smoothly on postgres as well. Fixes #5940
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7966 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-30 16:09:25 +00:00
mark_story
af799e179a
Adding missed model classes fixes #5940
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7963 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-29 03:20:05 +00:00
nate
963da7411b
Adding missing models to Model test case.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7960 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 22:51:10 +00:00
nate
8eade1adb3
Fixing code formatting to wrap at 100 characters, adding fix for ticket #5596 , counterCache now decrements properly when foreign key value changes.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7927 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:13:45 +00:00
phpnut
0d3ea7a5f2
Adding fix when join table does not have a primary key 'id' defined
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7918 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-12 17:19:27 +00:00
mariano.iglesias
2d9f2c5ac8
Fixing issue where test would pass on InnoDB but would fail on MyISAM
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7909 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-08 20:05:12 +00:00
AD7six
2f51ccca04
fixes #5772 .
...
Sql errors when using reserved words for a field name with the tree behavior.
Test Case restructured to allow thorough testing of the various permutations inwhich the tree behavior can be used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7880 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 13:57:44 +00:00
mark_story
6806b895cb
Fixing merging of actsAs and _findMethods from PluginAppModel classes. Adding test cases and necessary test classes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7875 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 20:24:27 +00:00
TommyO
6dc11420ee
Field type improperly and unnecessarily checked for HABTM inserts. Fixes #5718
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7855 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 20:55:51 +00:00
renan.saddam
171fa62b94
Added tests to cover bug with recursive = -1. Refs #5593 .
...
Did a refactoring to TranslateBehavior and moved all tests from translate.test.php to models.test.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7821 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-03 23:58:44 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
phpnut
d3896854f5
Adding fix for join table using UUID's as the primary key.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7775 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 13:29:32 +00:00
phpnut
4c2a3ee02f
Closes #5591 .
...
Modified models in models.php setting the with key since these models are not used unless the with key is defined in the association.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7740 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-13 01:17:34 +00:00
renan.saddam
8cc72d853d
Added test to disprove ticket #3771 . Closes #3771 as invalid.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7660 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 00:58:06 +00:00
DarkAngelBGE
caa4e321f2
Fixing unneeded conditions in child queries when conditions are present in the model declaration; fixes #5323
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7645 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 20:08:31 +00:00
phpnut
8a30e58504
Fixing class name in doc comment
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7587 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:48:13 +00:00
phpnut
a6f19c8240
Adding fix for Model::afterFind(); not having access to $this->data when using TreeBehavior
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7586 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:42:18 +00:00
nate
57c633a64f
Adding proper callback disabling for multiple finder types, fixes #5343
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7549 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 01:00:08 +00:00
renan.saddam
57575402bc
Removing deprecated methods. Commenting several classes.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7433 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-05 03:22:25 +00:00
nate
793295036f
Re-fixing Model::set() to allow for fields that don't exist, fixing model validation with messages, adding tests to prove parameter order for custom validation errors, refs #50005
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7408 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 06:28:59 +00:00
gwoo
f6d269a9e0
closes #5142 primary key on custom join models
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7393 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 15:38:23 +00:00
mark_story
c286736f69
Added afterFind callback to Models where recursive >= 2. Added tests from 'ezyang'. Closes #5103
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7347 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-20 17:25:39 +00:00
renan.saddam
64486027db
moving models to models.php
...
fixing translating issue
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7254 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 03:16:28 +00:00
DarkAngelBGE
8b9aa057dd
adding test for #4861
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7237 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-22 15:18:30 +00:00
nate
df75a06756
Fixing coding standards violations in core, and adding misc tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
c75cad26d5
updating model test for new find syntax
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7217 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-19 17:06:50 +00:00
phpnut
886183fcd4
Closes #4202
...
Adding patches
Added fixture files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7198 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-16 03:11:32 +00:00