Commit graph

99 commits

Author SHA1 Message Date
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
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
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
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