Commit graph

767 commits

Author SHA1 Message Date
mariano.iglesias
a33cfd0b98 Added Containable behavior, a mix of the original Containable and Bindable behavior.
Allows find operations to define restrictions on what models to get based on the 'contain' parameter, including ability to override binding settings on the fly. Go through the test cases to get a crash course about some of the available functionality.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6918 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 04:36:09 +00:00
mark_story
f011839cfe Update dbo_adodb.php. Passes 452 tests in model.test
fixes #4133

Added test for dbo_adodb as well

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6917 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 00:20:24 +00:00
mariano.iglesias
05047a90b0 Making Model::resetAssociations public and changing tests that use it
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6909 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 16:23:46 +00:00
phishy
6c44d00642 Fixed #4206 - lastError now works
Fixed #4181 - model sequence name now respected
added constraint() method to enable/disable
added truncate() to aid in test suite integration
hacked name() to work with ACL


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6903 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 15:42:13 +00:00
joelmoss
3d251e4145 Replacing vendor() function with App::import()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6900 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 08:41:39 +00:00
nate
d9a7170808 Adding validation message fixes for Model::saveAll() and hasOne associations, fixes #4561
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6898 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 06:03:33 +00:00
nate
0f1e075d68 Adding fix for Model::saveAll() with 'validate' => 'first' and hasMany records, fixes #4387, adding test cases to disprove #4494
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6897 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 05:31:14 +00:00
TommyO
de086b1be3 Minor code cleanup, removing remnants from an older version that no longer apply
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6894 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 20:17:58 +00:00
TommyO
52037d15e4 Allow afterSave() callbacks to modify value of a data field, as per ticket #2465\nNecessary tests included
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6889 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 15:37:55 +00:00
the_undefined
52245a059f Closes #4156
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6878 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 04:00:21 +00:00
the_undefined
ea9e91218e Fixing bug in Model::saveField, closes #4511
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6877 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 03:16:36 +00:00
the_undefined
dd7aa25a20 Made custom save $options available throughout all filters and callbacks
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6861 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 23:34:59 +00:00
the_undefined
fb7ac680b0 Made sure DboSource always has a prefix setting, closes #4601
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6857 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 22:53:44 +00:00
gwoo
99874c60d9 fixes #4238, Mysqli working with the test suite.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6849 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 18:03:44 +00:00
gwoo
c0f042e4ab fixes #4432, Model aliases. Updated cases. Removed usage of $this->model in model.test.php in favor of local variables
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6848 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 16:42:39 +00:00
the_undefined
425dbf363d Fixed bug in BehaviorCollection::trigger, closes #4520
Added basic test coverage for BehaviorCollection::trigger

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6828 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 02:33:44 +00:00
the_undefined
d9a30eaa62 Fix for Model::saveAll validate => first, closes #4533
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6825 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 01:39:06 +00:00
the_undefined
823eb81dc7 Fixed bug in Model::__save validation logic, closes #4554
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6824 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 01:03:11 +00:00
the_undefined
232e3f7ec1 Fix for Model::saveAll bug, closes #4466
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6823 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 00:39:29 +00:00
nate
c0d86a76d3 Fixing MSSQL Driver
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-11 18:53:54 +00:00
nate
32ea41a90e Correcting MSSQL limit/distinct handling, correcting date/time handling, fixes #4352, fixes #1778
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6748 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-03 14:15:47 +00:00
nate
358a613243 Fixing conditions quoting in DboSource, closes #4508
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6714 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-23 15:24:57 +00:00
the_undefined
5321ce98ec Giving bool return value to DboSource::insertMulti
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6708 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-22 16:59:26 +00:00
nate
42083e0a1b Refactoring insertMulti() for DboSource and drivers, updating Model test for non-transactional db's
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6707 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-21 12:31:28 +00:00
mariano.iglesias
d412d7094f Fixes #4467, issue with 'atomic' on saveAll not properly rolling back transaction. Thanks amit for the test.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6702 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-19 17:33:17 +00:00
nate
16bfee9831 Correcting issue in Model::__save() to prevent overwriting of existing record data
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6700 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-19 13:30:11 +00:00
nate
ed51f78227 Adding Model::saveAll() atomic fix, closes #4400, thanks joelmoss
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6697 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 13:14:40 +00:00
nate
0793138c6c Fixing SELECT DISTINCT queries for SQL Server + misc schema fixes, closes #4352
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6693 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 06:27:58 +00:00
nate
3e28323667 Fixing conditions quoting in DboSource::conditionKeysToString(), closes #4368
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6691 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 05:39:54 +00:00
nate
f6103830c3 Adding prepared statement support to Model::query(), closes #2069 (thanks Mark Story)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6687 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-18 00:30:32 +00:00
nate
8f3a2c6022 Refactoring model constructor
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6678 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-17 13:10:27 +00:00
gwoo
c38c6a21ba updating TranslateBehavior to handle one set of content per model, not per alias. fixes #4461
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6655 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-13 04:18:10 +00:00
nate
c7677c2a5e Fixing incorrect selection of parent nodes in ACL, fixes #4324
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6653 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-11 04:59:52 +00:00
phpnut
89c8467e89 "Fixes #4408, Options for a Behavior are not being reset for associated models using the same behavior"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6642 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-09 04:10:27 +00:00
phpnut
85f2946c36 "Fixes #4349, Correct usage of \"AND\" and \"and\" for conditions"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6641 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-09 02:24:09 +00:00
phpnut
5692ed149b "Updating doc comments for Model::create()"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6630 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-03 15:22:18 +00:00
phpnut
118c35f0d0 "Closes #4402, Model->create returns unexpected data type - sometimes.
Change to return Model::data; instead of true when empty"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6625 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-02 19:46:15 +00:00
phpnut
0ef028bc1f "Fixing self associated joins.
Added additional test cases and correct one bad test case.
Fixes #4364, !__mergeAssociation() in dbo_source fails to merge belongsTo properly"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6606 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-26 11:17:24 +00:00
nate
c4a4e9da39 Fixing handling of atomic transaction support with hasMany in Model::saveAll(), fixes #4372
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-22 21:23:06 +00:00
nate
d60191a1f6 Fixing vulnerability in field quoting in DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6594 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-20 16:40:45 +00:00
nate
0ca3915668 Forcing array in Model::invalidFields(), fixes #4362
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6592 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-19 01:34:23 +00:00
nate
c286a7293f Adding test cases for TreeBehavior scoping
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6591 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-19 00:54:32 +00:00
phpnut
1b4c445cad "Fixes #4256, tablePrefix + HABTM with defaults == wrong joinTable"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6585 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-16 07:18:42 +00:00
phpnut
a6fbe05964 "Initial refactoring of BehaviorCollection.
Fixed vendor path being the first searched directory for files, this caused unexpected results.
Fixed failing DboSource tests"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6583 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-16 05:44:20 +00:00
nate
360b91eea7 Fixing HABTM associations on non-standard keys, fixes #4219, refactoring DboSource::calculate()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6565 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-13 03:11:29 +00:00
nate
3ff5bfa829 Fixing default value for float columns in Postgres, fixes #3963
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6564 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-13 03:06:14 +00:00
phpnut
acc79fe0f3 "Closes #2508, Allow requestAction to use array urls
Fixes #4325, error pages no longer displayed since changeset
Closes #4329, remove am() usage in core"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6563 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-12 21:19:31 +00:00
nate
2c3ec768c7 Updating model tests for Postgres, fixing Postgres metadata handling for UUID primary keys, adding Postgres tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6558 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-11 05:22:17 +00:00
nate
c1c35b2e13 Refactoring DboSource - removes all SQL from Model, refactoring transaction handling
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6557 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-11 02:44:33 +00:00
gwoo
57a61f8f82 fixes #4165, string conditions with translate behavior
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6552 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-10 07:01:01 +00:00