Commit graph

385 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
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
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
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
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
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
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
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
phpnut
dcac88825a Adding fix for Ticket #2339
Adding fix for Ticket #2335
Adding fix for Ticket #2344

Merged changes in dbo from 1.2 to 1.1
Merged changes to session handling in 1.2 to 1.1
Merged changes to Model::_ _saveMulti() in 1.2 to 1.1
Added Set::pushDiff() to append differences in array 2 to array 1
Added SessionComponent::activate() and SessionHelper::activate() to turn sessions usage on if AUTO_SESSION is set to false
Added test for Ticket #2343
Added change to AclNode to use correct table naming
Added garbage clean up to CakeSession::_ _close(); some installs, like Debian, have removed garbage clean
up and use a cron job instead. Currently this change is only supported for database session.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4752 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 07:25:48 +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
nate
a64434c636 Misc. fixes to DboPostgres, added basic schema generation, and fixed getting insert IDs from sequence (Ticket #2309)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4727 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-01 05:42:31 +00:00
nate
f8995e0bde Adding Model::saveField() fix for triggering invalid hasAndBelongsToMany saves
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4720 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-31 20:27:47 +00:00
phpnut
095574ecc8 Adding fix for Ticket #2316
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4716 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-30 12:18:23 +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
phpnut
575b27d586 Backporting changes from 1.2 to 1.1
Adding Set class

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4711 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 22:48:24 +00:00
nate
15bae17de2 Removing column length from INT column type in DboMssql (Ticket #2308)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4706 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 02:21:50 +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
43297e3abd Fixing limit / offset for SQL Server
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4700 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-28 16:39:15 +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
282bfbf4fc Fixing SQL expression handling in Model::field() (TIcket #2283)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4684 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-26 18:38:54 +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
f48b908ac6 Disabling ORDER BY clause for Model::findCount (Ticket #2227) and updating test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4677 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-25 18:17:15 +00:00
phpnut
b899bb58b4 Adding fix for Ticket #2183
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4674 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-25 03:14:41 +00:00
phpnut
f8023ff0dc Added $config['database'] mysqli_connect() in DboMysqli::connect(), removed mysqli_select_db()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4661 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 10:56:42 +00:00
phpnut
330630c9d0 Adding fix for Ticket #2214
Removed persistent connection setting in DboMysqli::connect() since there is no persistent connection function for mysqli

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4656 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 08:57:42 +00:00
phpnut
2925df7c54 Adding fix for #2210
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4655 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 07:08:40 +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
c2c17f9b90 Fixing MySQL schema generation for null columns
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4637 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-21 05:00:54 +00:00