Commit graph

160 commits

Author SHA1 Message Date
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
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
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
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
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
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
f0cd2d49ea Adding fix for to correct additional 1:1 associations failing to query when there is a self join association.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4770 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 03:31:46 +00:00
phpnut
aeac37e707 Removing preg_replace() and adding additional param $where = true to DboSource::conditions()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4768 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 01:08:39 +00:00
phpnut
ea144501ae Fixing self association joins with conditions and fields
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4767 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 00:47:17 +00:00
phpnut
cc46c03f31 Adding fixes for association conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4763 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 21:40:59 +00:00
phpnut
da35cf3193 Adding fix for ModelTest::testRecursiveFindAll()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4761 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 19:55:57 +00:00
phpnut
49e58cec49 Adding fix for scaffold when using self associated HABTM
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4759 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 17:25:18 +00:00
gwoo
ed342c307d fixing check in magic methods for a value otherwise it will return false adding test to dbosource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4746 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-03 05:43:31 +00:00
gwoo
923303b462 fixing router when affected by requestAction #2319, adding check in magic methods for a value otherwise it will return false
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4740 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-02 19:20:50 +00:00
phpnut
918c6e7e93 Backporting changes to dbo drivers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4715 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-30 02:54:23 +00:00
phpnut
3a62793d0e Adding fix for Ticket #2232.
Added tests for ticket

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4714 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-30 00:08:10 +00:00
nate
0c2b92a650 Fixing NOT operations in query conditions in DboSource (Ticket #2307)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4704 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 01:45:13 +00:00
nate
f32cc3eb79 Adding DboSource destructor rollback fix (Ticket #2110)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4703 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 00:49:53 +00:00
nate
8b7f46acaa Adding field quoting fix in DboSource::name() (Ticket #2300)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4697 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-28 00:53:37 +00:00
nate
dbbe90c22c Fixing issue in DboSource with left joins on self joins
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4687 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-27 01:59:39 +00:00
nate
f2c7c5a677 Fixing calculated field parsing for DboSource::fields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4686 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-27 01:34:59 +00:00
nate
bb2a68caec Rewriting SQL generation for self-joins
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4679 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-26 17:16:43 +00:00
nate
6afca88bb2 Patching SELECT query test in DboSource::fetchAll() (Ticket #2288)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4678 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-25 19:46:16 +00:00
nate
c65f2a1fd2 Fixing boolean conditions expression handling in DboSource::conditionKeysToString() and added test case (Ticket #2268)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4647 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-22 00:59:28 +00:00
nate
2a095d9ea6 Fixing redundant SQL condition generation in DboSource::conditionKeysToString(), fixing SQL ORDER parsing (Ticket #2266) and updating test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4644 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-22 00:26:42 +00:00
nate
5197bf60d3 Updating DboSource with new query generator, and updating model/dbo test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4636 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-20 17:38:53 +00:00
phpnut
a9c128b0ec Adding fix for Ticket #2101.
Changed Helper::loadConfig() to accept a param with the name of the file to load

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4589 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-05 13:48:21 +00:00
phpnut
55a66a9091 Adding fix for Ticket #2084
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4574 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-04 05:19:30 +00:00
dho
076a5dbd63 Renaming $__transactionStarted to $_transactionStarted (ticket #2141)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4527 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-17 08:28:09 +00:00
dho
34c63427fb Renaming $__sources to $_sources (ticket #2140)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4526 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-17 07:31:29 +00:00
nate
6989f80376 Fixing the display of SQL errors when DEBUG > 0
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4520 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-15 03:03:17 +00:00
nate
30134cbd9e Importing new ACL system
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4487 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-09 08:13:13 +00:00
nate
fbc0ea77b7 Fixing $conditions === true in DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4478 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 18:13:14 +00:00
phpnut
af4bacb960 Reverting changes made in last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4477 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 17:58:19 +00:00
nate
15f7509171 Refactoring set() method into Object, and adding $conditiions === true translation in DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4475 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 17:33:59 +00:00
nate
b4cc0dfd96 Adding numeric value quoting fix for DboSource (Ticket #1927)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4411 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 15:21:51 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
nate
75d8f42684 Adding magic method fix for null query values (Ticket #1999), and adding PostgreSQL boolean quoting patch (Ticket #1788)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4396 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 02:21:44 +00:00
phpnut
ce033247ed Adding patch from #1844
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4394 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 23:58:02 +00:00
phpnut
03d15ff892 Adding fix for #1928
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4393 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 23:43:56 +00:00
phpnut
5c79d064aa Reverting changes recent changes to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4375 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:49:19 +00:00
nate
67c5c43761 Fixing undefined variable notice in DboSource::update()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4374 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:15:52 +00:00
nate
f1912bbe60 Fixing $fields error for belongsTo associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4373 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:13:33 +00:00
nate
0698b9cdf6 Updating DboSource with new query generator implementation, and updating DboSource tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4368 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 23:25:05 +00:00
nate
caeed6bf4c Adding PostgreSQL conditional expressions to DboSource (Ticket #1914)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4360 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 21:07:32 +00:00