Commit graph

345 commits

Author SHA1 Message Date
nate
0cea0a6ff5 Integrating new Validation class with Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4193 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-25 06:53:19 +00:00
nate
46f5c22a8f Fixing array formatting in DboMysql
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4183 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-24 19:20:45 +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
nate
a420c70c91 Optimizing findCount() query, and adding beforeFind() reference fix for Ticket #1693
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4165 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 20:36:00 +00:00
nate
19798c71b3 Adding 1.2 fix for Ticket #1797
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4132 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 00:17:52 +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
phpnut
238ddacded Cleaning up translations model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4124 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-22 20:30:09 +00:00
nate
982381dc74 Binding additional Behavior callbacks to Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4108 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-19 19:26:02 +00:00
nate
b5face3516 Changing Model::del to check for existence of itself before allowing deletes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4099 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-13 04:04:15 +00:00
nate
37281be9de Checking if model exists when setting 'created' field, to enable use with custom IDs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4094 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-12 22:06:22 +00:00
dho
cc9b30ad2f Typo (ticket #1738)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4088 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-08 17:37:54 +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
gwoo
ecb2b8c786 fix for generateList
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4065 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-04 06:59:56 +00:00
phpnut
adae18da2d Corrected doc comments in dbo sources.
Renamed DBO_Pear to DboPear

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4042 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-01 02:34:56 +00:00
phpnut
85b0e9c842 Adding core Oracle DBO driver
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4041 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-01 02:26:12 +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
phpnut
32d3349eb2 Adding fix for Ticket #1568.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4036 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-30 18:54:22 +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
phpnut
25eedb8502 Starting work on Translate model.
Restructured code to standards

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3995 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-27 18:15:36 +00:00
phpnut
e935b51b8d Adding fix for Ticket #1699
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3991 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-27 05:57: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
phpnut
ca5753bc39 Adding fix for Ticket #1683
This frees memory returned from a result set.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3943 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 20:23:43 +00:00
phpnut
fd65f226e6 Adding fix for Ticket #1626.
This fixes deleting of associated hasOne and hasMany when using bindModel before Model::delete()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3941 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 11:31:59 +00:00
phpnut
2e0ec28018 Fix for Ticket #1689.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3940 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 11:05:47 +00:00
phpnut
87af38c7dc Merging fixes from [3908] for Ticket #1689
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3909 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 20:25:13 +00:00
phpnut
b76c2179e1 Merged fixes from [3906]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3907 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 20:08:53 +00:00
phpnut
3180035f0f Merged fixes for Ticket #1681
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3905 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 19:58:53 +00:00
phpnut
883ecc1cd0 Merged fix for Ticket #1675
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3903 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 19:36:59 +00:00
nate
099144bcbd Changing Set interface to act like NeatArray, disabling Model::cacheQueries by default, and removing NeatArray usage in Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3888 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-21 22:40:30 +00:00
phpnut
c773b64bfe Starting to refactor model loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3885 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-21 21:48:05 +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
075891f1f9 Refactoring code and updating method references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3841 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-08 03:28:24 +00:00
phpnut
b42373467f Adding fix for scaffold when using an alias association, mostly found on self joined models, or models that have multiple associations to the same model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3820 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 21:01:24 +00:00
gwoo
8fef7cf4ba 1.2: fix for groupPath recursive in generateList
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3819 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 19:49:32 +00:00
nate
3b8b34114b Adding path fixes for DataSource loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3809 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 05:45:11 +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
nate
50da950aba Fixing Model::findCount() for ADODB (Ticket #1613)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3802 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-02 14:44:44 +00:00
phpnut
dedb404423 Merging fixes for associations to 1.1.x.x branch
Removed commented code from Model::_ _generateAssociation() in 1.2.x.x

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3796 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 20:31:45 +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
nate
e72eba2f82 Fixing PostgreSQL boolean conversion (Ticket #1586), and fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3784 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 06:14:50 +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
add6e512e7 Adding Model::__wakeup() (Ticket #1582)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3754 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 00:42:51 +00:00
nate
0bab7de4d6 Updating docblock for Model::create
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3753 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 22:35:40 +00:00
nate
d22e84af09 Fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3752 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:42:29 +00:00
nate
45f27cda1c Refactoring Model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3748 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 18:14:35 +00:00
nate
79a8944ba4 Refactoring Dbo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3741 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:43:35 +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
gwoo
42676402d3 fix for #1572, $this->id set to lastInsertId after save
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3739 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 12:07:16 +00:00
nate
2993a8d412 Adding Router path fixes for error pages (Ticket #1566), fixing code formatting (Dispatcher), and adding API enhancements for model behaviors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 17:24:37 +00:00
nate
3ed7c6e931 Adding 1.2 fix for Ticket #1498
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3725 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 02:32:50 +00:00
nate
fd4d9e41e2 Additional commit for [3713]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3716 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 23:03:55 +00:00
nate
7506859555 Fixing DataSource path typo in ConnectionManager, and removing hardcoded paths to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3713 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 19:35:29 +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
gwoo
d485edd1ab adding fix for generate list to 1.2
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3703 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 01:07:09 +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
8b23234b53 Fixing code formatting in DBOs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3668 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-14 17:21:28 +00:00
nate
3a03674c76 Moving DataSource::getFieldValue to Set::extract
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3667 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-14 17:19:03 +00:00
nate
d66ca81671 Adding validation logic fix (Ticket #1518)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3628 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-10 22:29:13 +00:00
nate
d412939912 Refactoring Model::save and teaching Model to eat XML
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3620 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 22:00:22 +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
49d8dac242 Merging in MS SQL fixes from 1.1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3591 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 22:41:50 +00:00
nate
f0a44f4810 Small refactoring in DboMysql
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3588 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 20:51:35 +00:00
gwoo
46d9b86b76 adding fix for #1465 and #1469
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3581 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 16:44:02 +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
nate
9a03326ad6 Adding DboPostgres::value() fix for boolean values (Ticket #1285)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3528 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-20 05:00:06 +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
nate
68e046e3a2 Adding 1.2 branch fix for Ticket #1357
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3515 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 02:50:53 +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
ead9f329e9 Adding fix for #1396.
Would not allow saving values with \ in the string

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3504 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-16 02:39:06 +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
f08a4d7fa2 Removing empty lines
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3480 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:50:33 +00:00
phpnut
fec633f227 Corrected bad merge on model.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3479 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:42:51 +00:00
phpnut
678ec860a1 Adding fix from #1215
Fixes issues with saving HABTM

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3478 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:37:51 +00:00
phpnut
27fc6bced9 Fixing error when using associations with recursive level deeper then 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3474 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 02:47:11 +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
198dab8a46 Filtering out empty magic fields when saving models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3463 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 00:35:06 +00:00
nate
213e22b1a8 Adding descrption compatiblity fixes to SQLite driver (Ticket #1211)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3450 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-05 15:37:13 +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
554b4ceb42 Fixing DataSource calls for PHP4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3429 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-25 00:43:48 +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
7971fc0de6 Refactoring model SQL and DataSource references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3404 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-17 11:44:29 +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
nate
951e257fa2 Removing model references to phpversion()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3377 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-06 23:21:36 +00:00
nate
0f69646186 Duplicating fix from [3373]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3375 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-06 22:51:59 +00:00
phpnut
36ae60d0e7 Making changes to Security class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3353 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-03 06:49:51 +00:00
phpnut
cf6d284b29 Added patch from Ticket #1229
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3350 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-01 21:58:13 +00:00
nate
60c6d3be02 Duplicating changes in [3332].
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3333 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-01 02:32:30 +00:00
nate
a75f33f430 Adding optgroup support for 2D arrays in FormHelper::select(); adding grouping ability to Model::generateList()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3326 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 23:31:04 +00:00
nate
ab419f3fe1 Resolving minor Model implementation differences between PHP4 and 5
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3325 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 16:49:40 +00:00
nate
796222dfeb Abstracting PHP4/5 overload implementation to custom base class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3324 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-30 12:24:03 +00:00
nate
cd3578e0b4 Adding optional $data parameter to Model::create(), allowing default data to be set when initializing a model
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3302 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 04:10:41 +00:00
nate
03fe0df49c Adding :-style named arguments
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3295 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 16:13:05 +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
ceb72b3415 removing some extra whitespace and removing an old @ from dbo_mysqli
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3282 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 15:09:43 +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
gwoo
6b62ff231a updated msqli driver
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3276 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-21 22:01:26 +00:00
dho
37e7d798d1 Applying doc patch (ticket #1186)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3275 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-21 08:48:41 +00:00
nate
82ebd41fa6 Adding fix for Ticket #1088, additional refactorings, and code formatting fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3253 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-13 14:55:48 +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
5af4c7e372 Adding same fixes as [3225] and [3223], and adding HtmlHelper::para() and HtmlHelper::div()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3226 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-11 14:34:35 +00:00
nate
4cf5dea802 Removing unused DBO pseudo-base-class
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3219 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 19:55:56 +00:00
nate
5d7d605723 Adding misc. db driver updates, and fixing code formatting of SQLite driver
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3218 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 19:49:13 +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
dho
af18379343 Fixing syntax error
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3212 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 07:07:45 +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
21be313929 Adding create() method to create DataSources dynamically; Ticket #1068
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3195 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-29 06:23:11 +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
dho
4ead20e052 Removing redundant value() function (ticket #1066)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3183 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-25 11:11:32 +00:00
dho
7e53b3909d Removing php extension from vendor (ticket #1067)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3181 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-25 07:56:08 +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
nate
77d92d58c1 Fixing DboMysql to use port # if specified
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3165 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-23 21:16:55 +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
phpnut
b31c449167 Added fix for Ticket #1016
Check box in edit view does not work.
Model::column() was returning text instead of boolean for the column type

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3136 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 02:55:53 +00:00
phpnut
965874ccae Merging fix from 1.1.x.x branch
[3132]
Adding patch from Ticket #1004.
This fixed problem with table prefix not being used when querying for the last record id

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3133 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:08:52 +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
feba2725c2 Code formatting and base configuration update
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3116 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 18:38:32 +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
9144b7a738 Adding ability to set encoding in db config (Ticket #795), MySQL and PostgreSQL only
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3111 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 14:10:22 +00:00
nate
14d5d8e979 Adding fix for Ticket #896
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3108 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 13:18:01 +00:00
dho
a8e49419bf removed characters which caused syntax errors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3101 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 08:39:50 +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
nate
c01efb36e4 Initial import of Sybase driver (non-functional)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3097 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 23:05:54 +00:00
nate
0def58fa67 Updating ConnectionManager with new DataSource paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3094 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 22:49:42 +00:00
phpnut
0801dce999 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3092 3807eeeb-6ff5-0310-8944-8be069107fe0 2006-06-14 19:06:14 +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
1dc168abc7 Merging fixes into 1.x.x.x branched code:
Revision: [2887]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2890 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-16 20:46:06 +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
75130a2187 Merging fixes into the trunk.
Revision: [2654]
Refactored the Object::cakeError()

Revision: [2653]
Adding check for custom error class in app/.
Added check for AppController::appError(); will be called if this method 
is in AppController.

Revision: [2652]
Adding fix for Ticket #704

Revision: [2650]
Fixing scaffold CSS

Revision: [2648]
Adding fix for Ticket #717

Revision: [2647]
Adding fix for Ticket #718

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2685 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-01 23:50:20 +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
phpnut
4a8c03ef1c Merging fixes into the trunk.
Revision: [2618]
Adding fix for Ticket #609

Revision: [2617]
Added fix for Ticket #684

Revision: [2616]
Adding patch from Ticket #649

Revision: [2615]
Adding fix for Ticket #608

Revision: [2614]
Additional fix for Ticket #584

Revision: [2613]
Adding fix for Ticket #584

Revision: [2612]
Added fix for undefined index notices

Revision: [2609]
Adding fix for Ticket #658

Revision: [2608]
Adding fix for Ticket #635, and code formatting fixes in FormHelper

Revision: [2607]
Adding fix for Ticket #636

Revision: [2606]
Adding fix to allow associations to be defined through non-associative arrays

Revision: [2605]
Adding fix for Ticket #672

Revision: [2604]
Adding fix for Ticket #708

Revision: [2603]
Adding fix for Ticket #687

Revision: [2602]
Refactoring database drivers, and adding fix for Ticket #398

Revision: [2601]
Merging change from model_php5.php

Revision: [2600]
Adding ODBC driver

Revision: [2599]
Adding fix for Ticket #702

Revision: [2598]
Adding fix for Ticket #699

Revision: [2597]
Fixing an issue in Model::set(), and moving limit() to DboSource

Revision: [2595]
Fixing unit test download URL in Bake

Revision: [2594]
Adding fix for Ticket #698

Revision: [2593]
Adding fox for Ticket #231

Revision: [2592]
Adding fix for Ticket #630, and updating MS SQL driver docstring

Revision: [2577]
Adding $alias property to enable future Oracle support

Revision: [2568]
Merging changes to bake from old sandboxes

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2620 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-27 10:04:08 +00:00
phpnut
4babd8b9c2 Merging changes to model_php4.php
Merging changes to bake.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2530 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:38:16 +00:00
phpnut
32f9e1e0e5 Merging fixes into trunk.
Revision: [2522]
renamed Bake class file

Revision: [2521]
removing old bake scripts

Revision: [2520]
Adding new Bake script

Revision: [2519]
Adding fix for Ticket #622

Revision: [2518]
Adding fix for Ticket #535

Revision: [2517]
Adding fix for Ticket #648, associated records are now post-processed by afterFind() method in associated model

Revision: [2516]
Adding fix for Ticket #618

Revision: [2515]
More error page fixes

Revision: [2514]
Adding fix for Ticket #690

Revision: [2513]
Removing empty method

Revision: [2512]
Adding fix for Ticket #675

Revision: [2511]
More fixes for Ticket #670

Revision: [2510]
Adding fix for Ticket #670, and removing pointless part of Helper::output(), since print() *always* returns 1.

Revision: [2509]
Adding fixes for Tickets #677 and #681

Revision: [2508]
Added patch from Ticket #632

Revision: [2502]
Adding fix to prevent model ID from getting overwritten when saving HABTM data [TEST ME] - thanks sdevore

Revision: [2501]
Rewriting foreach loops in queryAssociation()

Revision: [2493]
Adding fix for Ticket #673

Revision: [2492]
Adding reconnect() method, to reconnect to database with different settings

Revision: [2491]
Adding Microsoft SQL Server driver [EXPERIMENTAL]

Revision: [2490]
Fixing a bug that occurs when connecting to two different databases on the same server, and enabling cross-database model associations

Revision: [2488]
Adding fix for Ticket #651

Revision: [2487]
Adding fix for Ticket #665

Revision: [2486]
Adding fix for Ticket #655

Revision: [2485]
Forcing DboMysql to validate disconnect, and adding fix for Ticket #663

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2528 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:24:57 +00:00
phpnut
ef9836b402 Merging fixes into trunk.
Revision: [2480]
Adding fix for Ticket #662


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2482 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-11 21:13:00 +00:00
phpnut
a95a8c0a61 Merging fixes and enhancements into trunk.
Revision: [2478]
Merging differences between model_php4.php and model_php5.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2479 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-11 15:55:53 +00:00
phpnut
e3cadc0eb4 Merging fixes and enhancements into trunk.
Revision: [2470]
Adding fix for Ticket #653

Revision: [2469]
Adding fix for Ticket #652

Revision: [2468]
Enabling table list caching for DB DataSources

Revision: [2467]
Adding fix for Ticket #623

Revision: [2466]
Adding fix for Ticket #652

Revision: [2465]
More dbo_source::order() fixes, moving query() to dbo_source, and supporting additional find/findAll parameters in magic find methods

Revision: [2464]
Adding fixes for Ticket #610

Revision: [2463]
Adding an alias fix in DBO_Source, and an IIS rewrite patch for setUri()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2477 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-11 15:46:29 +00:00