mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Rémi Dewitte
9ecbdf4971
better with strict comparison
2013-03-01 15:51:15 +01:00
Rémi Dewitte
e2e5dfb91e
Keep default=false for boolean columns
2013-03-01 15:43:14 +01:00
mark_story
1d3095ece5
Fix formatting and expand find() docs.
2013-02-26 22:00:55 -05:00
mark_story
33bd7a571a
Restore whitelist when save fails.
...
Fixes whitelist not being restored when save fails due to no data.
Fixes #3646
2013-02-25 20:57:56 -05:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
ADmad
b32e855a3d
Fixing behavior prioritizing
2013-02-24 22:52:31 +05:30
nojimage
84725993e5
Postgres datasource support regular expression operators.
2013-02-22 10:14:06 +09:00
José Lorenzo Rodríguez
ef592363d6
Merge pull request #1123 from dogmatic69/model-cache
...
Breaking out the find so that it can be easily overloaded for caching
2013-02-16 06:05:11 -08:00
Mark
3b02013f7d
Merge pull request #1127 from dereuromark/master-strict-comparison
...
Strict comparison for strings where applicable
2013-02-14 01:10:48 -08:00
nojimage
fbb1a812dd
Create rename field statements in postgres
...
Refs #3622
2013-02-13 22:24:21 -05:00
mark_story
0d9ef854ff
Fix FULLTEXT column generation
...
Fixes #3618
2013-02-12 09:00:57 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
dogmatic69
e9a385e790
Adding the _findAll method
...
Now there are no special checks for find('all') and the find can be overloaded like you would
with any other find(*) methods.
2013-02-10 21:06:29 +00:00
dogmatic69
83a11b7189
adjusting the changes and adding some docs
2013-02-10 11:13:22 +00:00
dogmatic69
00abe27ef8
Breaking out the find so that it can be easily overloaded for caching
...
Before this commit you have to do some hacks to cache model finds easily. When using
custom find methods like `find('foo')` => `_findFoo(...)` it is common for the
method to adjust the query params.
Trying to cache a query using a hash of the query params :
function find($type, $query) {
$query = $this->_beforeFind($query);
$cacheKey = $type . '_' . md5(selialize($query));
$cache = Cache::read($cachKey, 'my_cache');
if ($cacheKey !== false) {
return $cache;
}
$results = $this->_afterFind($type, $query);
Cache::write($cacheKey, $results, 'my_cache');
return $results;
}
Before this commit you either have to completely overload find and rewrite it in the AppModel or call
the before to get the modified `$query` and let cake run the before again.
2013-02-09 16:20:46 +00:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
1ceb17589a
Merge branch 'master' into 2.4
2013-02-06 21:05:03 -05:00
Marc Würth
02e2fbe800
Fixed wrong statement in Sqlserver class header
...
http://www.php.net/manual/en/ref.pdo-sqlsrv.php
--> PDO_SQLSRV is a driver that implements the PHP Data Objects (PDO) interface to enable access from PHP to MS SQL Server (starting with SQL Server 2005) and SQL Azure databases.
2013-02-05 18:32:40 +01:00
Marc Würth
fa118a73a9
Fix for CakeShell schema generate for Sqlsrv
...
Do not generate invalid schema.php when using SQLServer
Refs #3559
2013-02-04 21:19:56 -05:00
euromark
05546aff32
coding standards
2013-02-04 09:26:50 +01:00
Perry
af71d5528f
apply code convention
2013-02-01 09:30:45 +08:00
ADmad
fb7fbcf01b
Added option to disable counter caches updating.
...
Closes #3109
2013-01-31 18:14:39 +05:30
Perry
5ac5e784de
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
2013-01-31 17:01:59 +08:00
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
mark_story
efadf3dcd3
Make sure sessions are started before destroying them.
...
Fixes #3551
2013-01-21 20:46:41 -05:00
mark_story
7790bcacff
Allow afterFind() to fully remove an associated record.
...
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.
Fixes #3541
2013-01-17 20:35:37 -05:00
mark_story
18e282f3aa
Fix space between function + parenthesis.
2013-01-17 19:36:46 -05:00
Renan Gonçalves
23d4807933
Fixing expected value from find when it results in failure.
...
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
2013-01-17 13:00:56 +01:00
euromark
19cfe40fd1
fix return type in docblock
2013-01-12 16:26:44 +01:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Majna
6d75d90c25
Code cleanup
...
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
2012-12-28 23:37:58 +01:00
Graham Weldon
a9293aa385
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
mark_story
965f0e87c5
Fix SQL errors in TreeBehavior.
...
SQL errors were caused by escapeField() usage in TreeBehavior. Quoted
fields were not correctly unquoted.
Fixes #3491
2012-12-26 20:55:07 -05:00
Saleh Souzanchi
ed761320df
Disabled callbacks in _getMax() & _getMin()
...
This fixes issues where model/behavior callbacks append into the query
conditions without checking that its an array. Disabling callbacks
should also improve performance a tiny bit.
Refs #GH-1049
2012-12-26 14:09:45 -05:00
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
ravage84
bd71f8aa25
Update lib/Cake/Model/Model.php
...
Corrected an unlogic link from Model:find to an appropriate page in the docs
2012-12-21 15:06:43 +01:00
Mark Story
69248dfb1a
Merge pull request #1001 from dogmatic69/refactor-uuid-checks
...
Refactor uuid checks into a method
2012-12-20 17:46:07 -08:00
euromark
2b1e5b02b5
code cleanup
2012-12-21 00:40:12 +01:00
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
mark_story
08cde9f5a2
Fix foreach error when useTable = false.
...
When calling model->create() with useTable = false, an error should not
be triggered.
Fixes #3480
2012-12-19 21:18:34 -05:00
mark_story
d70730d722
Fix issues with TreeBehavior and nested deletes.
...
Fixes #3481
2012-12-19 20:48:51 -05:00
euromark
ce93e7c206
(isset($contain[0]) && $contain[0] === null) always false
2012-12-18 01:28:05 +01:00
mark_story
4bdaa2b5a0
Merge branch 'master' into 2.3
2012-12-16 13:32:38 -05:00
mark_story
1528b5c382
Don't return true when there is nothing to save.
...
Model::save() should not return true when no work has been done.
Fixes #3469
2012-12-16 13:19:14 -05:00