Commit graph

204 commits

Author SHA1 Message Date
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
nate
1df76850c3 Enabling join models for all DBOs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4342 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-28 01:53:35 +00:00
nate
4f794248af Fixing magic method query generation for array condition values (Ticket #2008)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4340 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-27 17:48:48 +00:00
nate
dbbfa5b837 Fixing column quoting for array-based conditions when columns are wrapped in SQL functions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4330 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-24 20:04:27 +00:00
nate
51cf77d4cc Fixing issue with conditional values being empty arrays in DboSource::conditionKeysToString()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4319 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-22 19:21:21 +00:00
phpnut
658ab33959 Adding fix to allow Configure::write('debug', '0'); in a controller method
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4248 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-04 16:13:24 +00:00
nate
2ea8e4edee Adding NOT query conditions fix for Ticket #1793
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4167 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 21:24:30 +00:00
phpnut
4f1c5ef386 Wrapping all core messages in translation function
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4129 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-22 22:49:47 +00:00
dho
9ca5e14891 Adding new methods to Configure and moving all core messages using DEBUG to use Configure::read()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4069 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-05 09:49:59 +00:00
phpnut
83afee9a52 Merging fixes between branches for DboSource::generateAssociationQuery()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4037 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-30 22:26:24 +00:00
nate
cc484ddbd2 Adding DboSource::order parsing fix for Ticket #1677
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4004 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-28 08:18:53 +00:00
nate
b479c5f49e Adding fix for Ticket #1701
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3989 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-27 05:32:18 +00:00
nate
e955f3fd65 Refactoring DboSource::update(), and adding magic finder method fix for Ticket #1673
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3955 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 07:53:31 +00:00
nate
26955aefda Adding coding-issue fix (Ticket #1633), and insert ID fix (Ticket #1641), and updating method reference
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3857 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-10 18:45:46 +00:00
nate
eb01aad01d Fixing associations for ADODB driver (Ticket #1568)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3806 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 04:10:40 +00:00
phpnut
708dc77ae8 Merging __mergeAssociation() into 1.2 branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3793 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:27:08 +00:00
phpnut
f187ac9cef Adding fix for IN( sql.
Merging fixes between versions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3792 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:19:11 +00:00
dho
613bb29300 Adding special log output for cli
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3791 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 15:58:52 +00:00
phpnut
29ba60481a Fixing DboSource::execute() so it only logs when fullDebug is set to true
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3782 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 03:52:41 +00:00
nate
2046eed40d Refactoring DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3740 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:27:32 +00:00
nate
57f27126bd Adding conditions-based updating to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3709 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 15:38:37 +00:00
nate
eea428e55d Code formatting and 1.2 interface updates
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3689 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-16 20:02:34 +00:00
nate
76e52d3862 Adding fix for decimal numbers being quoted (Ticket #1360)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3618 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 21:42:35 +00:00
nate
1842759ed4 Adding 'with' join fixes, and field quoting fix for Ticket #1445
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3614 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 21:03:45 +00:00
nate
f01e1a28f4 Adding field quoting fix for Ticket #1372
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3536 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-21 03:56:57 +00:00
phpnut
bdf3e7e61f Fixed #1433
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3524 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-20 03:26:52 +00:00
phpnut
2d6eee36ac Refactored fix that was created in [3519]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3521 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 15:24:15 +00:00
phpnut
6cc9c12839 reverting changes made in [3519]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3520 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 15:17:17 +00:00
phpnut
79ad31c514 Adding fix for #833.
Fixes recursive >=1 when using Model::findCount();
Removed all fields being added to the query.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3519 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 07:20:51 +00:00
phpnut
fb7585e7ee Added fix for #1345 and #1417.
This fixes Self Referencing Models losing data when recursive > 1

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3513 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 02:08:54 +00:00
phpnut
fc54b0f31a Adding fix for #1165.
Changing Model::__constructLinkedModel() to use the association name for 
the instance of an associated model.
Changed DboSource::read() to use the association name.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3484 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 21:59:51 +00:00
phpnut
10ad71b30c Adding fix for association query when the association has a null value
for a FK


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3473 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 02:11:38 +00:00
nate
93f7dd32ca Fixing issue with magic field values ({$__cake_ID__}) being quoted twice
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3464 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 07:09:14 +00:00
nate
9f454bf5b9 Fixing operator parsing issue with array-based conditions (Ticket #1364)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3447 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-04 13:37:26 +00:00
nate
cb87dfc71d Fixing issue with empty $conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3442 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-30 16:00:20 +00:00
nate
b46c20ead4 Fixing limit/offset bug in hasMany/hasAndBelongsToMany associations, to enable paging of related models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3435 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-27 16:47:05 +00:00
nate
be1737114c Adding $primary parameter to Model::afterFind() (and Behavior::afterFind())
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3408 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 08:00:54 +00:00
nate
86e9b9090a Adding 'IS NULL' fix from Ticket #1075, and fixing join issue with AND NOT
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3401 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-15 19:19:39 +00:00
phpnut
4347f25025 Reverting changes made by gwoo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3284 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 16:45:18 +00:00
gwoo
c19dbc8806 added model property assoc. this allows access to the association keys => conditions, fields, order, limit, offset from the controller
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3281 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 15:05:01 +00:00
nate
07ec77ef22 Adding model behaviors, model onError callback, and updating FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3280 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 14:13:07 +00:00
nate
bc745b234a Making same change as [3235]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3236 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-12 04:37:49 +00:00
nate
4e183bf492 Fixing notices generated by new HABTM features
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3213 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 15:29:55 +00:00
nate
86fc29facb Adding join table selects (MySQL-only so far), findBy/findAllBy magic method enhancements (Ticket #412)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3200 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-04 01:29:48 +00:00
nate
0dec0353b1 Model::create() sets default field values based on table def (Ticket #1079 [MySQL-only so far])
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3193 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-29 05:18:34 +00:00
phpnut
3a9343c7a7 Merged fixed from [3177] into 1.2.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3179 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-24 21:33:51 +00:00
phpnut
8c6b0576af Merging changes from 1.1.x.x branch:
[3157]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3158 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-22 20:42:53 +00:00
nate
85d5fe3bba Adding fix for Ticket #910 (broken db sessions)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3140 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 16:15:49 +00:00
nate
dfb49aad38 Adding additional fixes for autoComplete(), Ticket #1002
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3131 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-18 19:21:09 +00:00
nate
e0edd33ebd Adding fix for Ticket $645; it is now possible to force a separate query (instead of left join) by adding 'external' key to association definition
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3112 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 14:39:34 +00:00
nate
cc35b218e1 Adding fix for Ticket #992
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3100 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 23:55:17 +00:00
phpnut
9d19dee879 Renaming branched version directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.1.x.x@3085 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 18:02:37 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00
phpnut
5e268e0805 Merging fixes into 1.x.x.x branched code:
Revision: [2802]




git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
f5a4a58758 Renaming directory for 1.x.x.x code base
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2771 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-07 03:35:58 +00:00
phpnut
e41214da87 Merging fixes into 1.x.x.x branched code:
Revision: [2706]
Adding check for selecting insert id's

Revision: [2701]
Adding fix for Ticket #727

Revision: [2700]
Added patch from Ticket #730

Revision: [2698]
Added fix for Ticket #732

Revision: [2696]
More dbo_source::order() fixes

Revision: [2695]
Adding fix for order(), and results checking in __filterResults()

git-svn-id: https://svn.cakephp.org/repo/branches/1.0.0.2685@2727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-04 00:35:48 +00:00
phpnut
0c0dec8bc0 Merging fixes into the trunk.
Revision: [2629]
Fixed recursive associations when set to 0, did not add the hasOne or belongsTo in the query.
Changed scaffold to use recursive setting of 0 in all methods that call Model::findAll()
Fixed Invalid argument supplied for foreach() notice in show.thtml
Removed 500 record limit in Controller::generateFieldNames()

Revision: [2628]
Merging changes from model_php5.php

Revision: [2627]
Fixing messed up characters in dbo_odbc, adding docstrings, and giving connect() a return value

Revision: [2625]
Bringing all DB drivers up to date

Revision: [2624]
Changed fixed for Ticket #609 so and empty array is set instead of null.
This is more consistent with the other arrays that are returned if an association is found

Revision: [2623]
Adding fix for Ticket #712

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2630 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-28 05:26:06 +00:00