Commit graph

224 commits

Author SHA1 Message Date
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
phpnut
43e074acb0 Merging fixes and enhancements into trunk.
Revision: [2457]
Adding fix for Ticket #612

Revision: [2456]
"Enables use of Controller::$data in addition to Controller::$params['data']"

Revision: [2455]
"Adding fix for Ticket #634"

Revision: [2454]
"Removing trailing directory separator on ROOT"

Revision: [2451]
Dispatching and routing changes for IIS

Revision: [2450]
Downgrading error level in AclNode::create and adding additional filename check in listClasses()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2462 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-06 00:06:02 +00:00
phpnut
c899c085f5 Merging fixes and enhancements into trunk.
Revision: [2448]
removing tabs in last commit

Revision: [2447]
Adding fix for limit in all associations

Revision: [2446]
Added fix for Ticket #569

Revision: [2443]
Adding fix for Ticket #592.

Revision: [2437]
Adding fix for Model::findNeighbours().
Was returning all associations and fields. Now recursive is set to 0 and only returns the prev and next keys array

Example $this->Category->findNeighbours(null, 'Category.id', 4);

Will return,

Array
(
    [prev] => Array
        (
            [Category] => Array
                (
                    [id] => 3
                )

        )

    [next] => Array
        (
            [Category] => Array
                (
                    [id] => 5
                )

        )

)

Revision: [2432]
Removed the DS constant from the plugin var when it is set in Dispatcher.
Added "$this->plugin.DS." constant in files where needed after change above.
Added fix for Ticket #577.

Revision: [2428]
Added fix for HtmlHelper::checkbox() it ignored the value provided as a parameter
Fix for Ticket #605.
Fix for Ticket #607.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2449 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-28 19:46:59 +00:00
phpnut
87d703eaa5 Merging fixes and enhancements into trunk.
Revision: [2426]
Added patch from Ticket #566.

Revision: [2425]
Adding patch from Ticket #603.

Revision: [2424]
Adding fix for Ticket #604

Revision: [2423]
Adding fix for Ticket #601

Revision: [2422]
Refactoring ACL and updating queries

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2427 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-28 02:44:55 +00:00
phpnut
c141859d3a Merging fixes and enhancements into trunk.
Revision: [2420]
Added fix for Ticket #320.
Fixed Model::save() so it will only allow a model to save itself.
Fixed Model::save() when saving a HABTM association

Revision: [2419]
Added fix for Ticket #463

Revision: [2418]
Added patch from Ticket #598

Revision: [2417]
Added fix for Ticket #581

Revision: [2416]
Adding fix for Ticket #579

Revision: [2415]
Adding patch from Ticket #597

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2421 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 19:15:30 +00:00
phpnut
23b0101ff8 Merging fixes and enhancements into trunk.
Revision: [2413]
Adding fix for Model::bindModel() when association name is different from className setting in the array.
Removed second param in Model::__generateAssociation() that was not used.
Removed unneeded foreach() in Model::__createLinks().

Revision: [2412]
Adding fix for Ticket #564 

Revision: [2411]
Adding fix for Ticket #596.
Also found other variables that where not used properly

Revision: [2410]
Added fix for Ticket #561


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2414 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 17:31:33 +00:00
phpnut
d595e46055 Merging fixes and enhancements into trunk.
Revision: [2406]
Adding model persistence when using var $uses array.
Added var $name to PagesController

Revision: [2405]
Adding 5 of the 7 patches from Ticket #594

Revision: [2404]
Added fix for Ticket #575

Revision: [2403]
"Adding fix for core vendors directory when cake installation is separated into different paths "

Revision: [2402]
Added fix for Ticket #588

Revision: [2397]
Adding fix for Ticket #580

Revision: [2387]
Adding fix for Ticket #558

Revision: [2386]
Adding fix for Ticket #562

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2407 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 09:59:40 +00:00
phpnut
78441c007c Merged fix into trunk
Revision: [2376]
Added fix from Ticket #556

Revision: [2375]
Added fix for Ticket #557

Revision: [2374]
Added fix for Ticket #552 and  Ticket #553

Revision: [2373]
Added fix for Ticket #554


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2377 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-19 14:13:07 +00:00
phpnut
23d183e46b Merging fixes and enhancements into trunk.
Revision: [2369]
Added missing doc comments to classes

Revision: [2368]
Removing core view paths from Configure class

Revision: [2367]
Updating View class to use new Configure class to search paths for view files

Revision:[ 2366]
Corrected loadControllers() in basics.php

Revision: [2365]
Updating function in basics.php to use new Configure class

Revision: [2364]
removed duplicate loading of app/config/bootstrap.php

Revision: [2363]
Added new Configure class to hold paths to models, views, and controllers related to Ticket #470.
Moved loading of app/config/bootstrap.php to Configure class from app/webroot/index.php.
Added creating instance of Configure instance in cake/bootstrap.php
Added example of setting custom paths in app/config/bootstrap.php 
Corrected error in Object::_savePersistent().

Revision: [2362]
Added fix for Ticket #534

Revision: [2361]
Refactoring persistent code a little more.
File now holds a variable with the serialized class and is include vs. reading file contents.

Revision: [2360]
Refactored persistent methods to use cache()

Revision: [2359]
Fixing array_combine() Warning in  Model::generateList()

Revision: [2358]
Set var $persistModel to false by default

Revision: [2357]
Moved persistent code to Object class.
Moved $TIME_START variable to top of file.
added __sleep methods for models

Revision: [2356]
Reverting persistent changes to Model class

Revision: [2355]
Adding fix for Ticket #550

Revision: [2354]
Corrected errors in persistent code

Revision: [2353]
Corrected overwrite in the model/model_php4.php file.

Revision: [2352]
Adding persistent methods to Model class.
This will allow caching of classes.
Added app/tmp/persistent directory.

Revision: [2351]
Reverting changes to dbo_source.php in [2350]

Revision: [2350]
Removed name pattern matches related to Ticket #534

Revision: [2349]
Adding fix for Ticket #548

Revision: [2348]
Adding fixes from Ticket #547.

Revision: [2347]
Adding fixes from Ticket #546.

Revision: [2346]
Adding fix for Ticket #527

Revision: [2345]
Refactored Html::url()

Revision: [2344]
Last fix for Ticket #483 

Revision: [2343]
Updating last commit

Revision: [2342]
Adding fix for Ticket #483

Revision: [2341]
Adding fix for Ticket #543, DBO will now only cache SELECT queries

Revision: [2340]
Adding session_write_close() to the CakeSession::__regenerateId()

Revision: [2339]
Adding patch from Ticket #544

Revision: [2338]
Adding patch from Ticket #529

Revision: [2337]
Adding patch from Ticket #528

Revision: [2336]
Removing the converting of \n to <br /> in Sanitize::html()

Revision: [2335]
Added bash script from Ticket #533

Revision: [2334]
Added enhancement for Ticket #474

Revision: [2333]
Correcting errors introduced with prior fix

Revision: [2332]
Correcting errors introduced with prior fix

Revision: [2331]
Performance optimization for NeatArray::findIn(): replaced foreach loop with for

Revision: [2330]
Minor performance optimization: Replacing all occurrences of low() with strtolower()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2370 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-19 03:26:43 +00:00
phpnut
d6f056d5c0 Merging fixes and enhancements into trunk.
Revision: [2328]
Merging changes from model_php5.php

Revision: [2327]
Fixing queries that don't respect model aliases in conditions clauses

Revision: [2326]
Adding in-memory query caching to DBO_Source, and Model->cacheQueries property to control the behavior

Revision: [2325]
A recovering discarded association data for recursive belongsTo joins


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2329 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-16 05:33:47 +00:00
phpnut
1e666b23bb Merging fixes and enhancements into trunk.
Revision: [2323]
Adding SQL error message display.
Fixed  Invalid argument supplied for foreach() in dbo_source.php on line 472

Revision: [2322]
Fixed undefined index datasource.php on line 438

Revision: [2321]
Adding error messages for ConnectionManager if no database file is present.

Revision: [2320]
Merging changes from model_php5.php

Revision: [2319]
Removing $this->validationErrors = null; in Model::set();

Revision: [2318]
Refactoring Model::invalidFields()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2324 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-16 01:50:55 +00:00
phpnut
fb46bcceef Merging fixes and enhancements into trunk.
Revision: [2316]
Added fix for message:  Warning: array_diff(): Argument #2 is not an array in Controller::__construct()

Revision: [2315]
Adding fix for Ticket #517

Revision: [2314]
Corrected scaffold throwing errors when irregular words are used for model/table names

Revision: [2313]
Added patch from Ticket #495.
Added missing ?> bracket at end of file

Revision: [2312]
Corrected model names being set to lower case, When matched to an irregular word in Inflector methods.
Added custom inflections.php file to allow application to have custom inflection rules.
Correct variable in View::renderCache(). error thrown if time class was used $time variable changed to $timeStart.

Revision: [2311]
Corrected $db placed in wrong section of the method

Revision: [2310]
Removing the db attribute from the model, This will help better with persistent objects

Revision: [2309]
Adding fix for Ticket #490

Revision: [2308]
Update to previous commit

Revision: [2307]
Removing references to Model->db. DataBase connections are now singleton-only.

Revision: [2306]
Refactoring getDataSource() into loadDataSource() and enumConnectionObjects()

Revision: [2305]
Reverting changes to this file

Revision: [2304]
Fixing Ticket #496, getColumnType, and docstrings

Revision: [2303]
Adding fix for Ticket #510


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-15 20:45:59 +00:00
phpnut
fc0854e397 Merging fixes and enhancements into trunk.
Revision: [2287]
Merging changes from model_php4.php

Revision: [2286]
Added serialized object data to the cached file.
Instances of the view helpers are available in the views now.
You also have access to the Controller::<component>, example $this->controller->Session;

Revision: [2285]
Adding Controller::postConditions() to convert a POST'ed data array to a Model conditions array

Revision: [2284]
Adding Model::invalidate() and refactoring Model::invalidFields().  Adding a fix for RequestHandler::accepts()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2288 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 02:26:08 +00:00
phpnut
2862d11796 Merging fixes and enhancements into trunk.
Revision: [2270]
Refactored clearCache()

Revision: [2269]
Removed timestamp in file name.
Removed debug code in model_php5.php


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2271 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 09:31:36 +00:00
phpnut
54df7c300f Merging fixes and enhancements into trunk.
Revision: [2267]
Removed the 50 record limit on the Model::findAll().
Added _ between file and timestamp
Fixed error thrown when variable was not an array


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2268 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 08:56:11 +00:00
phpnut
c439ed8742 Merging fixes and enhancements into trunk.
Revision: [2263]
Fixed Model::_clearCache() not having the name of the current model in the $assoc array

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2264 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 07:23:40 +00:00
phpnut
3d3d083f30 Merging fixes and enhancements into trunk.
Revision: [2261]
Adding fix for Ticket #479.
Removed unused $alias variable.

Revision: [2260]
Merging changes from model_php4.php

Revision: [2259]
Added Model::_clearCache(). This is used to delete cached pages when changes are made to a model,
will also be used to delete cached queries

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2262 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 06:58:53 +00:00
phpnut
89fbf1c8bf Merging fixes and enhancements into trunk.
Changing version number to 1.x.x.x, 0.10.x.x code base had been changed to the version number 1.x.x.x, and what was planned for 1.x.x.x code has
now been moved to 2.x.x.x, and 2.x.x.x moved to 3.x.x.x. This will give us easier to track version numbers from now on.

Revision: [2248]
Merging changes from model_php5.php

Revision: [2247]
"Removing test code from view class"

Revision: [2246]
Removed cache time define from core.php.
Modified the __() function in basics.php to echo string like it will in later versions of cake with translations.
Refactored the cache checking in bootstrap.php to read the files embedded time stamp and delete or output the cached version.
Added View::cacheView() for caching pages.


Revision: [2245]
Moving column formatting from DBO to Sanitize

Revision: [2244]
Adding beforeValidate() Model callback, and allowing query data to be modified in beforeFind()

Revision: [2243]
"Adding caching changes to Controller class "

Revision: [2242]
"Added check to delete cached version if it has expired"

Revision: [2241]
Adding app/cache/views directory

Revision: [2240]
"Fixed missing variable"

Revision: [2239]
"Adding full page caching to view class."

Revision: [2238]
"Adding defines for caching"

Revision: [2237]
"Adding caching check too bootstrap.php"

Revision: [2236]
Adding ClassRegistry::removeObject from Ticket #477

Revision: [2235]
"Correcting setting in DATABASE_CONFIG class"

Revision: [2231]
Adding convenience function am(), which allows merging an infinite number of arrays merged into one

Revision: [2207]
Change Model::save() to call beforeSave() before validations

Revision: [2199]
Removing conditions method call in Model::field()

Revision: [2196]
Setting proper mime type again

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2250 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 00:11:40 +00:00
phpnut
03ba042f41 Merging fixes and enhancements into trunk.
Revision: [2193]
Adding fix for Ticket #471

Revision: [2192]
Adding fix from Ticket #464.

Revision: [2191]
Adding fix for Ticket #461

Revision: [2190]
Adding fix for array_merge_recursive() error when unbindModelis used

Revision: [2189]
merging changes made in model_php5.php

Revision: [2188]
Fixing controller so $viewPath can be set as a var

Revision: [2186]
Adding Security component

Revision: [2185]
Adding additional RequestHandler detection, form security authentication, and automagic view variable $data

Revision: [2183]
Fixing Ticket #473

Revision: [2182]
Adding fix for Ticket #261

Revision: [2181]
Changing MySQL column defs from 12 hour times to 24 (#465)

Revision: [2180]
Fixing Tickets #463 and #462, and an error in Controller::setAction()

Revision: [2179]
Fixing a bug I found in AjaxHelper::link(), and changing the stopwatch time to 4 decimals

Revision: [2177]
Added patch from Ticket #459

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2195 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-08 03:13:32 +00:00
phpnut
f6cf220c40 Merging fixes and enhancements into trunk.
Revision: [2175]
Merging changes made to model_php5.php

Revision: [2174]
Adding fix for empty values being set for an update.
Fixed problem with view paths being set wrong on Windows.

Revision: [2173]
Adding additional condition operators

Revision: [2172]
Adding fix for Ticket #455

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2176 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-02 06:23:16 +00:00
phpnut
26fbf4a287 Merging fixes and enhancements into trunk.
Revision: [2170]
Adding column formatting for create() and update()
This is also a fix for Ticket #450




git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2171 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-01 21:24:19 +00:00
phpnut
9c5e3bb979 Merging fixes and enhancements into trunk.
Revision: [2168]
Added patch from Ticket #458

Revision: [2167]
Merging changes made to model_php5.php

Revision: [2166]
Added methods to allow what is discussed in Ticket #452

Revision: [2165]
Added fix for Ticket #453

Revision: [2164]
Added DBO column abstraction and column-based data formatting/escaping

Revision: [2163]
Added patch from Ticket #457.
Added fix for Ticket #456.

Revision: [2162]
"Added fix suggested in Ticket #454"

Revision: [2161]
"Diff added + symbol, removed it"

Revision: [2160]
"Added all fixes for Ticket #448"

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2169 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-01 19:13:48 +00:00