Commit graph

4135 commits

Author SHA1 Message Date
phpnut
8ed1b69b3f Refactoring association joins, Fixes the issue with adding the Model.id if it is not already added.
Adding fix for string based fields.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4831 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 21:30:55 +00:00
nate
d416fbe4ed Removing name() method from DBO drivers (Ticket #2372)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4830 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:54:07 +00:00
mariano.iglesias
dd956694af Adding tests to force foreignKey fields in hasMany
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4829 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:21:42 +00:00
mariano.iglesias
e9d7d60292 Adding tests for automatic addition of ids in hasMany
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4828 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:12:59 +00:00
phpnut
dcf64033ed Adding fix for undefined index
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4827 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 09:40:56 +00:00
phpnut
00be91c954 Adding first implementation of hasMany associations using one select statement.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4826 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 08:54:25 +00:00
phpnut
cff6ea0ee8 Removing some duplicate code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4825 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:05:22 +00:00
phpnut
95e2782d72 Initial work on using one select statement for hasMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4824 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:00:04 +00:00
phpnut
9a6d54b400 Adding enhancement from Ticket #2366
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4823 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-08 23:30:31 +00:00
phpnut
cc030bed0f Adding patch from Ticket #2368
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4822 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-08 04:13:28 +00:00
phpnut
26b32ec999 Moving fixtures directory in the application skeleton
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4821 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-08 00:14:04 +00:00
phpnut
29e1e6a570 Merging fixes into the trunk:
Revision: [4818]
Adding fix for test in [4816].
This fixes hasOne association conditions

Revision: [4817]
Fixed tests

Revision: [4816]
Added test for conditions in binding

Revision: [4815]
Removing fixtures directory

Revision: [4814]
Adding fix for Ticket #2364

Revision: [4813]
Fixed test

Revision: [4812]
Adding fixes for test in [4811] fixes Ticket #1100

Revision: [4811]
Added tests for issue #1100

Revision: [4810]
Adding fix for Ticket #2363
Removed use of:
mysql_insert_id($this->connection);
mysqli_insert_id($this->connection);

Revision: [4809]
Added test for #2361

Revision: [4808]
Adding fix for Ticket #2360

Revision: [4807]
Fixing test for PHP4

Revision: [4806]
Improved test for #2360

Revision: [4805]
Test added to replicate #2360

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4820 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 22:17:26 +00:00
phpnut
3ec4ecd127 Adding fix for test in [4816].
This fixes hasOne association conditions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4818 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 20:12:06 +00:00
mariano.iglesias
0fbcd7f9a4 Fixed tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4817 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 19:51:20 +00:00
mariano.iglesias
81b473f2a3 Added test for conditions in binding
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4816 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 19:30:27 +00:00
phpnut
18e0cb8c2d Removing fixtures directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4815 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 08:51:12 +00:00
phpnut
20e41074c9 Adding fix for Ticket #2364
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4814 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:44:18 +00:00
mariano.iglesias
b151eda69e Fixed test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4813 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:42:08 +00:00
phpnut
d0c8cde9ab Adding fixes for test in [4811] fixes Ticket #1100
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4812 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:29:46 +00:00
mariano.iglesias
5e2d4167e3 Added tests for issue #1100
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4811 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 04:56:17 +00:00
phpnut
784ee985b5 Adding fix for Ticket #2363
Removed use of:
mysql_insert_id($this->connection);
mysqli_insert_id($this->connection);

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4810 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 01:42:12 +00:00
mariano.iglesias
8b2e2e6a7a Added test for #2361
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4809 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 19:12:15 +00:00
phpnut
980e713df7 Adding fix for Ticket #2360
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4808 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 19:05:06 +00:00
mariano.iglesias
da5e9c05a5 Fixing test for PHP4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4807 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 19:01:46 +00:00
mariano.iglesias
5eaa76afe0 Improved test for #2360
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4806 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 18:35:25 +00:00
mariano.iglesias
f18ebf2117 Test added to replicate #2360
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4805 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 17:33:49 +00:00
phpnut
847cf2345f Merging fixes into the trunk:
Revision: [4802]
Refactoring duplicate code into one method

Revision: [4801]
Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4804 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 12:38:06 +00:00
phpnut
aaa2e3cf21 Refactoring duplicate code into one method
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4802 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 12:19:23 +00:00
phpnut
d5fa0a961b Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4801 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 11:15:45 +00:00
phpnut
48f3349c9a Merging fixes into the trunk:
Revision: [4796]
Removing comments from Set::merge()

Revision: [4795]
Adding fix for Ticket #2353

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4798 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 21:40:37 +00:00
phpnut
924a235ec3 Removing comments from Set::merge()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4796 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 21:29:00 +00:00
phpnut
69da631d61 Adding fix for Ticket #2353
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4795 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 21:20:08 +00:00
phpnut
1ad04a6558 Merging fixes into the trunk:
Revision: [4792]
Merging changes from 1.2.x.x Set class to 1.1.x.x branch

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4794 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 20:19:33 +00:00
phpnut
135ebe8994 Merging changes from 1.2.x.x Set class to 1.1.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4792 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 20:09:32 +00:00
phpnut
a677c882e7 Merging fixes into the trunk:
Revision: [4789]
Fixing last commit, had removed the ! prior to committing

Revision: [4788]
Adding fix for duplicate conditions being merged into the final query on self associations

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4791 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:23:46 +00:00
phpnut
eae615527d Fixing last commit, had removed the ! prior to committing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4789 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:04:07 +00:00
phpnut
10bb0f303a Adding fix for duplicate conditions being merged into the final query on self associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4788 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:00:15 +00:00
phpnut
4f04f09978 Merging fixes into the trunk:
Revision: [4785]
Adding fix for Ticket #2347

Revision: [4784]
Adding fix for Ticket #2317.
Added ability to cache queries to Model::query() by passing true as a second param.
Before this method would turn off caching automatically and there was no way to turn it on.

Revision: [4783]
Adding fix for Ticket #2351

Revision: [4782]
Adding fix for Ticket #2349

Revision: [4781]
Fixing typo

Revision: [4780]
Adding headers

Revision: [4779]
Adding new Set::merge() and Set class test case, thanks Felix

Revision: [4778]
Fixing [Only variable references should be returned by reference]

Revision: [4777]
Remove deprecated methods from test cases

Revision: [4776]
finishing changes to FormHelper

Revision: [4775]
Preventing session started messages in session test

Revision: [4774]
Removing old AclNodeTest methods this code is no longer valid on 1.2

Revision: [4773]
Added test for combination of self joins and belongsTo

Revision: [4771]
Fixed test to used array based self join

Revision: [4770]
Adding fix for to correct additional 1:1 associations failing to query when there is a self join association.

Revision: [4769]
fixing some changes to FormHelper

Revision: [4768]
Removing preg_replace() and adding additional param $where = true to DboSource::conditions()

Revision: [4767]
Fixing self association joins with conditions and fields

Revision: [4766]
Fixed test

Revision: [4765]
Fixed test

Revision: [4764]
Fixed tests to include parenthesis used in ON clauses

Revision: [4763]
Adding fixes for association conditions

Revision: [4762]
adding fix to FormHelper::create() for plugin path with action, see #2342. Adding default sizes, maxlengths, and values to input. FormHelper::inputs() will now return all the fields in the model without the need to pass anything from the controller, uses a blacklist so some fields can be skipped. Added PaginatorHelper::numbers(),  will output current page numbers, uses a modulus to decide how many to show on each side of the current page. Paginator::options() now allows setting default paging params

Revision: [4761]
Adding fix for ModelTest::testRecursiveFindAll()

Revision: [4760]
Commenting debug code in model.test.php

Revision: [4759]
Adding fix for scaffold when using self associated HABTM

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4787 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 18:10:39 +00:00
phpnut
ba8421cce2 Adding fix for Ticket #2347
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4785 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 17:09:52 +00:00
phpnut
56451426fb Adding fix for Ticket #2317.
Added ability to cache queries to Model::query() by passing true as a second param.
Before this method would turn off caching automatically and there was no way to turn it on.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4784 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 16:50:03 +00:00
phpnut
b486b6f076 Adding fix for Ticket #2351
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4783 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 16:09:51 +00:00
phpnut
52f03bd340 Adding fix for Ticket #2349
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4782 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 16:06:37 +00:00
dho
dc06a86291 Fixing typo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4781 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 12:11:23 +00:00
mariano.iglesias
df78e11548 Adding headers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4780 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 06:08:00 +00:00
nate
ac904cd4d4 Adding new Set::merge() and Set class test case, thanks Felix
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4779 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 05:57:52 +00:00
phpnut
1c6c32981e Fixing [Only variable references should be returned by reference]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4778 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 04:47:01 +00:00
mariano.iglesias
08526db3f4 Remove deprecated methods from test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4777 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 04:39:46 +00:00
gwoo
c81fd8b256 finishing changes to FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4776 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 04:31:46 +00:00
mariano.iglesias
5c1d178616 Preventing session started messages in session test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4775 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 04:27:44 +00:00
phpnut
56b7050858 Removing old AclNodeTest methods this code is no longer valid on 1.2
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4774 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 04:22:42 +00:00