Commit graph

369 commits

Author SHA1 Message Date
Rachman Chavik
c6449f649f adding missing ',' 2012-02-23 09:08:17 +07:00
Rachman Chavik
b545d8b201 fix getSchemaName() for Sqlserver.
Closes #2609.
2012-02-23 08:25:07 +07:00
Mark Story
b7302850b5 Merge pull request #467 from tPl0ch/2.1-required-update-create
Added support for simplified required validation on 'create' or 'update'. Fixes #230.
2012-02-22 09:43:13 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Ceeram
ee54daef35 AclNode now throws exception instead of trigger_error 2012-02-20 15:41:57 +01:00
mark_story
89b9bb7297 Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
dogmatic69
3246cf7c1e adding the model alias so that there are no issues when the find has a join on it 2012-02-16 16:22:45 +00:00
Ceeram
bc07ba3839 Added option['deep'] to saveAll, to save unlimited levels associated data
Squashed commit of the following:

commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 22:29:33 2012 +0100

    update docblocks for deep save

commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:17:34 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:16:57 2012 +0100

    Revert "adding info in docblock about associated model fieldList"

    This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.

commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 18:05:18 2012 +0100

    adding info in docblock about associated model fieldList

commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 17:51:44 2012 +0100

    add tests for deep saveAll respecting fieldList option

commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Feb 12 16:51:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Feb 7 13:54:59 2012 +0100

    Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data

commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:22:26 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date:   Wed Jan 25 14:19:25 2012 +0100

    validate all the things as well

commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date:   Mon Jan 23 18:22:12 2012 +0100

    Merge branch '2.1' into 2.1-saveAllTheThings

commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Dec 9 15:11:52 2011 +0100

    making saveAll, saveMany and saveAssociated not limited to only save directly related models
2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701 Updating docblock 2012-02-12 22:11:55 +05:30
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Ceeram
2897c72215 AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
Conflicts:

	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Aco.php
	lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
mark_story
9c1fa28d60 Its EXECUTE not EXECUCUTE
Also make the search insensitive as casing bugs are no fun.
2012-02-10 12:43:07 -05:00
mark_story
0cfec525b2 Allow SqlServer to execute procs correctly.
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.

Fixes #2558
2012-02-09 22:27:30 -05:00
Yasushi Ichikawa
e8a9d93eb5 Add params option to logQuery()
Parameters for prepared statements are now part of the
logged query data.
2012-02-08 20:15:40 -05:00
Thomas Ploch
07b16987a3 Fixed strict checking of 'required' attributes. 2012-02-07 15:31:27 +01:00
Thomas Ploch
4f3b266491 Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230. 2012-02-07 12:15:04 +01:00
mark_story
4bb4040851 Check method existence before calling.
Datasource does not implemente calculate() or
expression().  Only call them if they exist.

Fixes #2535
2012-02-05 12:54:20 -05:00
mark_story
ace9fefb02 Merge branch '2.0' into 2.1 2012-02-03 21:54:50 -05:00
mark_story
49a48ced89 Don't restrict to BASE_TABLE.
This allows Views, and custom table types
to be connected to models in SqlServer.

Fixes #2529
2012-02-03 21:54:26 -05:00
Shadow6363
62e671f6b8 Changed MySQL in comment to SQLite. 2012-02-03 21:03:34 -05:00
mark_story
a275555297 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
mark_story
4dd13ef554 Fix issue where session would always be regenerated.
Fixes #2519
2012-01-29 15:37:14 -05:00
mark_story
b9053161f4 Split I18nModel into a separate file.
Refs #2514
2012-01-29 13:28:08 -05:00
ADmad
ca32ca185a Fixing API docblock 2012-01-29 22:24:26 +05:30
mark_story
d904ab00fa Merge branch '2.0' into 2.1 2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8 fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464 2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
Ceeram
6d69ec3a78 update book link 2012-01-25 10:12:59 +01:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Jose Lorenzo Rodriguez
37314a2188 Logging transaction commands in DboSource, fixes #2457 2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52 Preventing datasource creationa and access on models having $useTable = false; 2012-01-21 14:03:11 -04:30
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Ceeram
d4e2fbf6b8 set correct default validate option, now matches saveAll/saveMany default value, fixes #2492 2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3 Merge changes from 1.3 to 2.0
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
2012-01-19 22:50:40 -05:00
mark_story
eb101b9eb8 Update Model::saveAssociated() documentation
Fixes #2492
2012-01-19 21:10:46 -05:00
Ceeram
2a9e6771c3 allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769 2012-01-19 23:26:43 +01:00
AD7six
b62d9729a9 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab Merge branch 'feature/set-nest' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
2012-01-19 10:51:09 +01:00
Scott Harwell
e1738c8c4a Added check for NOT in key when array count === 1 to prevent SQL error 2012-01-18 15:04:53 -05:00
Majna
d2dd861417 Update doc block for 'keepExisting' HABTM option. 2012-01-17 22:02:30 +01:00
Majna
e947df36a5 Remove unnecessary condition in Model::getID(). 2012-01-17 21:57:40 +01:00
Majna
826374e57c Remove unnecessary param when calling begin, commit and rollback on datasource. 2012-01-17 21:52:22 +01:00
Jose Lorenzo Rodriguez
e25867da79 Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP 2012-01-12 20:12:38 -04:30
mark_story
97ce118294 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
Victor Yap
cf8c1cd93b Return length 36 for uuid columns in Postgres.describe()
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.

Fixes #2467
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7 Replace smart quotes with ASCII equivalents.
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745 Add additional empty() for tablePrefix.
Fixes compatibility issues with plugins that worked correctly in
previous point releases.

Fixes #2462
2012-01-10 21:01:03 -05:00
mark_story
a8bc916104 Move check out of the loop, and allow nulls.
Refs #2341
2012-01-10 20:15:59 -05:00