Commit graph

1455 commits

Author SHA1 Message Date
U-Zyn Chua
e527506c39 MySQL: Numeric data type now supported under decimal column. #3171 2013-09-28 23:05:53 +08:00
U-Zyn Chua
73cae88a6f SQL Server support of numeric type. #3171
Float & real map to float. Numeric & decimal map to numeric.
2013-09-28 22:48:37 +08:00
Schlaefer
be61a5023f Refactors Model::_clearCache
- don't use mixed keys in $assoc array
- removes unnecessary strtolower on Inflector::underscore result
- return early
2013-09-28 10:16:23 +02:00
U-Zyn Chua
c74c8d49a1 Decimal support for SQLite. #3171 2013-09-28 14:36:55 +08:00
U-Zyn Chua
a1a3e70039 Decimal support for PostgreSQL. #3171 2013-09-28 14:07:00 +08:00
Bryan Crowe
bb65765d70 Updated additional references of Cake to CakePHP 2013-09-27 21:31:35 -04:00
U-Zyn Chua
7fb51ab50f Decimal support for MySQL. #3171 2013-09-28 09:23:46 +08:00
Schlaefer
99ec97bd19 performance improvements in Model::_clearCache
- don't empty cache twice if pluralized name is identical to underscored
- refactors for fewer function calls
2013-09-27 16:39:23 +02:00
Andy Hobbs
0f7d6a90a1 Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
2013-09-26 11:56:14 +01:00
ber clausen
39bc8dff97 Wrong signature. 2013-09-25 09:12:49 -03:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
ADmad
1d89ee1c6d Fixed TreeBehavior::recover() when using scope. Fixes #4062. 2013-09-19 00:39:19 +05:30
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
4ea6c158d1 Fix wording and remove trailing spaces. 2013-09-16 12:04:29 -04:00
Jerome Roethlisberger
3a4a0e54eb Improved wording of Model::invalidFields()
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
2013-09-16 16:13:58 +02:00
ovidiupruteanu
f416a321c7 flushMethodCache not working if called before cacheMethod
When calling flushMethodCache it correctly empties self::$methodCache but if cacheMethod is called afterwards self::$methodCache gets populated with data from the Cache.
2013-09-12 22:02:39 +03:00
Marc Würth
446792987a Replaced two elseifs by if in sqlserver datasource 2013-09-11 23:15:05 +02:00
Ber Clausen
0a52061d86 Update afterFind() callback signature to be PHP5.4+ compliant. 2013-09-10 14:15:01 -03:00
Ber Clausen
867d4b312d Update afterSave() callback signature to be PHP5.4+ compliant. 2013-09-09 21:34:11 -03:00
ovidiupruteanu
b58940e9b5 Fixed handling null values in Sqlserver->value
The value function quoted a null value as N'' instead of NULL.
As a result is produced queries like [name] IS N'' instead of [name] IS NULL which resulted in an SQL error.
2013-09-09 16:33:54 +03:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
Mark Story
0f528c279a Merge pull request #1614 from okinaka/2.x-disused-code
Postgres::truncate(): Delete disused code.
2013-09-05 18:16:22 -07:00
Mark Story
66394f2201 Merge pull request #1610 from bar/php54-callback-signatures
Update Model/Behaviors callback signature to be PHP5.4+ compliant.

This may require updates to userland behaviours.
2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4 Fix CROSS JOINs
While seldomly used, CROSS joins should not generate invalid SQL.

Fixes #4050
2013-09-05 12:45:48 -04:00
Ber Clausen
c524645738 Update Model/Behaviors callback signature to be PHP5.4+ compliant. 2013-09-05 11:17:02 -03:00
okinaka
e0f24d0ade Postgres::truncate(): Delete disused code. 2013-09-05 14:11:50 +09:00
Kim Egede Jakobsen
63dfbe55f7 Added/removed newlines to make the code more readable. 2013-09-01 12:09:14 -07:00
Kim Egede Jakobsen
09bdad6ceb Reduce variable use/duplicate code. 2013-09-01 12:08:48 -07:00
Kim Egede Jakobsen
b64c7e3e84 Remove the $state === 'after' condition.
Can only be before / after.
2013-09-01 11:06:45 -07:00
euromark
eb71eeeac5 add scope for generateTreeList - resolves ticket 4028 2013-09-01 01:02:26 -07:00
mark_story
f18d354f55 Merge branch 'master' into 2.4 2013-08-28 12:35:07 -04:00
mark_story
c1ae41da51 Correctly generate bigint primary keys in sqlite.
generate bigint primary keys correctly. Autoincrement cannot be set as
it only works with INTEGER columns[1]. I decided to use some string
manipulations as the entire SQL generation bits are a bit janky and I've
already re-written them for 3.0.

[1] https://www.sqlite.org/autoinc.html

Closes #GH-1552
2013-08-27 18:11:04 -04:00
euromark
80d55feda6 also remove app ones 2013-08-25 21:42:03 +02:00
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
mark_story
faa2cbd3c3 Remove session.auto_start configuration.
It now fails in PHP >= 5.5.2 . Also it never did anything in earlier
versions as the session would have already been started if auto_start
was true.

Fixes #4010
2013-08-21 13:18:44 -04:00
Rachman Chavik
9d8bb8c047 Sqlite::truncate(): Verify sqlite_sequence exists before _execute()
`sqlite_sequence` is a dynamic table that's only available when a table in
the database use an auto increment field.  For some cases, eg: databases that
exclusively use uuid for primary keys, this table won't exist and
truncate() call will fail with:

  Error: SQLSTATE[HY000]: General error: 1 no such table: sqlite_sequence
2013-08-21 16:34:21 +07:00
euromark
361980fade remove code, class names and paths from translation strings. 2013-08-21 00:05:53 +02:00
Renan Gonçalves
8ca92a1af0 Breaking trigger_error() to multiple lines to shorten the line length.
As proposed in https://github.com/cakephp/cakephp/pull/1525/files#r5779374
2013-08-20 17:48:56 +02:00
mark_story
0f2d59d987 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
675f828e16 Remove insertQuery and deleteQuery.
These properties were never implemented and are misleading when people
try to use them.

Closes #3997
2013-08-18 21:37:37 -04:00
mark_story
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8 unify null checks - avoid method call in favor of strict check 2013-08-16 20:12:49 +02:00
dmromanov
7989bad5b7 Corrected codestyle 2013-08-16 14:12:27 +04:00
dmromanov
56ef44f495 Excluded method names from several tanslation strings
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04:00
dmromanov
aa7c912c15 Removed concatenations in gettext $msg param. Closes #3986. 2013-08-15 03:15:35 +04:00
mark_story
3bdcf7b440 Use inner join instead of a left join.
In some database servers an INNER join performs better than a LEFT join.

Fixes #3979
2013-08-13 13:40:59 -04:00
k-halaburda
0c1dbded67 Added some test for related model afterFind callback 2013-08-13 10:19:48 +02:00
k-halaburda
bb13af683b Added some test for related model afterFind callback 2013-08-13 10:19:20 +02:00
mark_story
26769edd04 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/CakeTime.php
	lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
mark_story
6ce10b28c9 Update doc blocks. 2013-08-12 14:37:43 -04:00
euromark
f3018cc532 refactor methods to avoid else block on returning early 2013-08-12 19:06:34 +02:00
euromark
b09dc7213a deprecate Controller::flash() and adjust some other deprecation messages. 2013-08-12 12:51:12 +02:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
k-halaburda
74eb32696a Some more space / tabs issues [Travis PHPCS=1 fail] 2013-08-09 11:51:19 +02:00
k-halaburda
2655d16c13 Fixed tabbing in some places 2013-08-09 11:17:12 +02:00
k-halaburda
3855c0690e Fixed tabing formating 2013-08-09 10:26:44 +02:00
k-halaburda
c033df3218 Fixed duplication of Model's afterFind callback in HABTM relation and content of array passed to that callback [ticket 3970] 2013-08-09 09:56:33 +02:00
euromark
fc2d28974b remove undocumented code and uncessary in_array() checks + cleanup 2013-08-08 03:56:58 +02:00
mark_story
e36c537cf6 Switch from LEFT to INNER joins.
INNER joins are often more efficient as they can result in fewer rows
being examined before a result set is generated.

Fixes #3968
2013-08-07 12:50:02 -04:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
ADmad
473e4f991f Fixed bug when using multi model fieldList and whitelists for all models are not provided.
Fixes #3948
2013-08-03 02:49:41 +05:30
mark_story
2d2721d2d9 Update docs for MySQL
MySQL supports a few non-standard options. Document them.
2013-07-19 23:01:16 -04:00
Mike Scarborough
c780ded512 add SSL support to MySQL PDO connections 2013-07-19 22:56:51 -04:00
euromark
7a1a3e593d Always create user agent hash in session 2013-07-18 12:02:42 +02:00
mark_story
e03d3df0fe Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/View/HelperTest.php
	lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
Phally
1fe424a62b Moves code out of the try/catch blocks in the connect() methods.
That code wouldn't throw a PDOException, so having it in the
try/catch block is pointless. Moving it out makes it easier to
read.
2013-07-15 12:59:46 +02:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
euromark
a643295e4c remove @access and unnecessary $name 2013-07-08 15:50:50 +02:00
ADmad
4ded269549 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +02:00
euromark
e7f380d2b7 doublespace to single space 2013-07-05 14:36:40 +02:00
euromark
c989624f80 whitespace coding standards 2013-07-05 14:15:18 +02:00
mark_story
c597855fe4 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
f389435bae coding standards and else block simplification 2013-07-03 19:27:17 +02:00
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
Jose Lorenzo Rodriguez
58149f2315 Backporting from 2.4 fix for booleans in mysql when running PHP 5.5 2013-07-02 16:51:29 -04:30
Marc Würth
ff1f80349a Removed superfluous break
In every case of the if clause it will return, so break is not needed.
2013-07-02 21:00:24 +02:00
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
Marc Würth
aabeaada0f Fixed @return statement in DboSource::disconnect 2013-06-27 17:38:46 +02:00
Marc Würth
070a6f0ad5 Added a related cookbook link to DataSource.php 2013-06-26 22:07:52 +02:00
Jose Lorenzo Rodriguez
489d1db7d1 More edge case handlignfor native_type in mysql for older versions of
php
2013-06-24 14:15:15 +02:00
Jose Lorenzo Rodriguez
b8bbf0b4a9 Preventing notice in older versions of php 2013-06-24 14:03:50 +02:00
Jose Lorenzo Rodriguez
f6eac9a175 Fixing boolean type introspection for Mysql in PHP 5.5 2013-06-24 13:42:29 +02:00
mark_story
dcf7df39d2 Merge branch 'master' into 2.4 2013-06-21 17:47:37 -04:00
euromark
1b1943954b CakeSession improvements 2013-06-18 23:49:42 +02:00
ADmad
12da3b1f27 Merge branch 'master' into 2.4 2013-06-16 13:07:44 +05:30
Mark Story
b2a40c787d Merge pull request #1327 from pafuinlu/patch-2
Added a clear() function to Model.php (2.4 branch)
2013-06-14 06:18:37 -07:00
Thom Seddon
305b3f4688 Unify modified/created times
The former implementation meant that it was not guarantee that
the times automatically generated for the modified/created fields
would be exactly the same for a given operation.
2013-06-12 13:51:56 +01:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
Pafu Inlu
08cef539f9 Update Model.php
fixed comment spacing
2013-06-08 05:53:35 -06:00
Pafu Inlu
089c9e1139 Added a clear() function to Model.php (2.4 branch)
1.) Changed Pull Request from master branch to 2.4 (Old Pull Request: https://github.com/cakephp/cakephp/pull/1323)

2.) Updated return value in comment
2013-06-04 15:59:54 -06:00
mark_story
cbf3228c34 Fix inconsistent name/alias usage.
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
2013-06-02 13:50:23 -04:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Marc Würth
2bbd391972 Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
Damien Biasotto
e1c27af9e9 Fix typo variable name in _deleteDependent().
It's not a big deal but there was a typo in _deleteDependent() method. 

$savedAssociatons instead of $savedAssociations.
2013-05-29 14:25:39 +03:00
Mark Story
b111750494 Merge pull request #1308 from Jippi/hotfix/sql-bug-with-not-in-with-one-key
Hotfix/sql bug with NOT in with one key
2013-05-28 10:21:21 -07:00
Christian Winther
9e6120c86a This fixes an issue where attempting to use "!=" in a condition with an array with only a single element generates invalid SQL.
Example:
$condition['Model.id !='] = array(1, 2); //Generates Model.id NOT IN (1, 2) as expected
$condition['Model.id !='] = array(1); //Generates Model.id != = (1) which is invalid SQL

Patch will cause the above to generate Model.id != (1);

This an implimentation of @markstory's suggestion on PR 1232
2013-05-28 11:54:31 +00:00
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
mark_story
9ee610757e Throw exceptions when invalid permission keys are used.
Silently 'failing' to save permissions is bad, throw exceptions instead.

Fixes #3851
2013-05-24 21:47:22 -04:00
mark_story
408aac4798 Update return types. 2013-05-21 15:45:22 -04:00
mark_story
72b75660e5 Merge branch 'master' into 2.4 2013-05-16 21:31:27 -04:00
ADmad
4d434ec9f3 Fix CS errors 2013-05-13 23:51:32 +05:30
euromark
8aa0f5a8e9 adjust dbo source for sqlLogs variable 2013-05-06 14:32:47 +02:00
ADmad
a10275fb8b Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
ADmad
db26e24cb7 Remove error setting when reading/deleting non-existent key.
Fixes #3813
2013-05-04 03:16:33 +05:30
mark_story
3d682ba5e4 Update limit() in SQLServer to handle large page numbers as well. 2013-05-02 23:29:10 -04:00
mark_story
d4036310e4 Update limit() for Postgres
It should work like the parent class.
2013-05-02 23:27:26 -04:00
mark_story
00569ea405 Update limit() for Sqlite.
It should behave as the parent class does.
2013-05-02 23:25:13 -04:00
mark_story
7b0af659a9 Stop calling limit() twice on the same data.
DboSource::limit() now follows its documented input types, passing an
already formatted LIMIT string will result in LIMIT 0. Remove useless
array merging as well.
2013-05-02 23:12:38 -04:00
mark_story
2096d3f632 Clamp limit values to be unsigned integers.
This solves large page numbers potentially turning into scientific
notation when being formatted into queries. It also further safeguards
against SQL manipulation.

Refs #GH-1263
2013-05-02 22:36:50 -04:00
ADmad
19f8274a95 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
Ceeram
ef90850801 Removing extra whitespace, phpcs fix 2013-04-23 12:54:48 +02:00
Simon Males
77feac9ef6 Second parameter of ClassRegistry::init() is a boolean, not a string 2013-04-22 14:06:30 +08:00
mark_story
62660c6706 Re-assign $db after beforeSave.
This allows model/behavior methods to change the datasource in the
beforeSave callback. If you use drivers from different SQL platforms
things will go very poorly.

Fixes #3606
2013-04-21 21:15:44 -04:00
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
0f3d28c6ea Fix condition parsing in mysql specific cases.
When using collation + array values the incorrect operator would be
used. IN should be used over =.

Fixes #3772
2013-04-18 21:52:22 -04:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
mark_story
b210849b95 Expand doc blocks for Model::query()
There were some undocumented options that had test cases.

Refs #3748
2013-04-10 21:43:25 -04:00
mark_story
5c83bc177d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-04-09 22:09:56 -04:00
ADmad
819d9e2cbc docblock tweaks for apigen 2013-04-08 00:26:59 +05:30
mark_story
853e19e70e Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Model/Model.php
2013-04-07 14:35:23 -04:00
ADmad
20047c5060 Tweak docblock for api generator 2013-04-07 23:13:03 +05:30
ADmad
56df02f720 Improved docblocks 2013-04-07 18:53:32 +05:30
Rémi Dewitte
c70a3868a9 schema update CREATEs non-existing tables instead of ALTER 2013-04-03 17:37:09 +02:00
ADmad
d809b1480e Fix CS errors 2013-04-01 02:16:52 +05:30
mark_story
041c2d289f Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
Andy Dawson
e92e3df2fb Even less queries 2013-03-25 09:46:02 +01:00
Andy Dawson
8ea0212265 make tree recovery much, much simpler 2013-03-24 22:03:20 +00:00
mark_story
729ef8fe58 Fix default null not being reflected by SqlServer
Apply patch from 'Josh Rehm' to fix null default values from being
stomped on when reflecting table schema.

Fixes #3615
2013-03-19 21:02:27 -04:00
mark_story
81dc4c1e85 Merge branch 'master' into 2.4 2013-03-13 20:30:25 -04:00
Ceeram
8374eb92cc fix failing tests. test and mocked sources would cause exceptions 2013-03-13 22:31:23 +01:00
Ceeram
dde0912d1e Throw exceptions only when datasource has wrong package, not check for instance of Datasource 2013-03-13 17:56:51 +01:00
mark_story
3d4ebc038c Throw exceptions when non Datasource classes are used as Datasources.
Using models as datasources can cause segmentation faults. Guard against
that by checking types and raising exceptions early.

Fixes #3694
2013-03-12 21:59:45 -04:00
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Rémi Dewitte
ab510d1700 Add settings array to connection parameters that executes SET statements once connected 2013-03-07 23:45:42 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
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
Ceeram
54607ba0fa fix coding standards, double whitespace 2012-12-15 18:24:29 +01:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
Mark Story
45f6ade800 Merge pull request #997 from rhelms/2.2.5-text-index-in-fixture
Cater for length part of TEXT field in indexes for MySQL'

Fixes #3428
2012-12-12 17:27:30 -08:00
Reuben Helms
07dbc4a527 Cater for length part of TEXT field in indexes for MySQL
Cater for length on TEXT column in index for _alterIndexes

Handle nested arrays in schemas

Used when writing indexes containg TEXT field for MySQL

Change comment style from code review

Remove stray space

Only generate length part of TEXT index column field when necessary

Override buildIndex() in Mysql instead of name()
Revert DboSource::buildIndex to previous state
Update Mysql::_alterIndexes for code reuse
Update MysqlTest to handle quoted index names.

Make code clearer, as per code review

Adjust function comments, as per code review
2012-12-13 08:33:43 +10:00
ADmad
c159854a17 Improve docblock 2012-12-11 00:44:42 +05:30
Ceeram
a8eca60fc5 fix coding standards 2012-12-10 17:40:12 +01:00
dogmatic69
49ea72e53e rename the method and fix docblock return type 2012-12-08 13:10:12 +00:00
Mark Story
38c592928d Merge pull request #1000 from dogmatic69/validation-simplify
Validation simplify

Simplify internals in Model/Validation
2012-12-07 19:00:46 -08:00
mark_story
8b0a7ee13d Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
dogmatic69
b3dba95b7d making uuid field check protected 2012-12-07 02:24:12 +00:00
dogmatic69
521a759911 refactor uuid checks into a method 2012-12-07 02:22:24 +00:00
Mark Story
00d178fa28 Merge pull request #999 from dogmatic69/model-simplify
Simplify some model code
2012-12-05 18:18:50 -08:00
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
dogmatic69
b92b7c2d2d removing variables that are unnecessarily used 2012-12-05 10:55:11 +00:00
dogmatic69
0ada30f3bc removing nested if statement 2012-12-05 10:54:30 +00:00
dogmatic69
b99066ddd9 simplify some model code
remove nested if's and else where possible and early return.
2012-12-04 02:06:20 +00:00
dogmatic69
03882f4b55 fix up the fails 2012-12-04 01:58:57 +00:00
dogmatic69
24abed969a simplify validation code 2012-12-03 15:51:20 +00:00
mark_story
002700071d Fix incorrectly quoted fields when using the || operator.
Fixes #3404
2012-12-02 20:59:56 -05:00
Thomas Ploch
7f0085cd4e Added type hinting to Model::validator()
Added missing param and fixed typo in method's phpdoc.

Used 'assertSame' and 'assertNotSame'. Removed piped NULL type from phpdoc.

Simplify condition in Model::validator()
2012-11-28 21:32:00 -05:00
mark_story
ffcf71c810 Merge branch 'master' into 2.3 2012-11-28 21:30:15 -05:00
mark_story
f250592fee Fix multi-model validators with deep & atomic.
Apply patch from 'Christian Buffin' to fix validateMany() and
validateAssociated() when atomic=false & deep=true are used in
conjunction. Using Hash to flatten the nested set of validation results
yields the correct results.

Fixes #3352
2012-11-28 21:26:40 -05:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
mark_story
82d20ed948 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-24 15:44:52 -05:00
Mark Story
780b6f01b4 Merge pull request #962 from srwebs/feature/empty-bool-operators
Fix: check if bool operators in find conditions are empty.
2012-11-24 10:14:22 -08:00
Sam Mousa
8ef3034482 Added the table name to the cacheKey used by DboSource::fields. #3394 2012-11-24 12:22:17 +01:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
ceeram
4611c987db Merge pull request #959 from ceeram/phpcsw
Make phpcs pass
2012-11-19 15:10:47 -08:00
Nicolas
9c7f357029 Check if bool operators in find conditions are empty. 2012-11-17 12:39:08 +01:00
Ceeram
6d0e32e642 fix coding standards, remove break after return/continue 2012-11-15 12:09:14 +01:00
mark_story
a7f192c606 Merge branch 'master' into 2.3 2012-11-14 21:50:29 -05:00
Mark Story
7206254166 Merge pull request #955 from dereuromark/master-tree-fixes
Asserting that tree behavior generates valid sql in recover

Fixes #3366
2012-11-14 18:03:05 -08:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
b7e75a6399 more whitespace coding standards 2012-11-14 12:36:55 +01:00
euromark
8f78b1e05b fix coding standards for whitespaces 2012-11-14 12:24:08 +01:00
euromark
354069d229 cascade false for recover 2012-11-13 21:12:46 +01:00
ADmad
ac087ec938 Fix rules set being updated with array instead of CakeValidationRule objects. Closes #3367 2012-11-13 22:13:15 +05:30
euromark
22f65f7cb5 asserting that tree behavior generates valid sql in recover 2012-11-13 11:18:17 +01:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
ADmad
7360abb0fe Added query logging to DboSource::insertMulti(). Closes #3354 2012-11-09 16:51:51 +05:30
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
Ryan Morris
fa759231da Update checkRequired to simply check if an array key is present rather than isset (which fails if the value is null) 2012-11-03 14:41:06 +09:00
mark_story
60f9626838 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
Ceeram
093275aef6 Use correct value when using virtualFields in conditions and IN (), refs PR#897
Squashed commit of the following:

commit 6a986953e16601fb34a132df24ae16f882f218cf
Merge: babd714 118dd8c
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 13:02:15 2012 +0100

    Merge branch 'master' into virtualcondition

commit babd714d80178c68b0e3fbcc21fc53b846484fd8
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 00:22:43 2012 +0100

    fix incorrect tests

commit 9a46c13e1aa13905b8e5474947933676e03009ce
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:44:19 2012 +0100

    add test for regular fields and conditionKeysToString with IN

commit 3aa62e5cb93aa0c7bbb47e874fc1446873dd0d27
Merge: a8f0c3d 1f31340
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:37:01 2012 +0100

    Merge branch 'master' into virtualcondition

commit a8f0c3d918761ff2c456cc3a53f1e3ee5b1c6173
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Oct 11 16:46:10 2012 +0200

    use correct value when using virtualFields in conditions and IN ()
2012-11-02 14:29:38 +01:00
Ceeram
b8607ca2ed fix fieldlist, refs PR808 and PR851
Squashed commit of the following:

commit 7007dba0eb836f852aaca95fada103bc4ba993a9
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 10:53:39 2012 +0100

    Merge branch '2.3' into calinseciu-2.3

commit 3ca4d231bf80d2bb1c0572196f633da68c1a0db7
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Sep 23 12:45:00 2012 +0200

    more tests added

commit e6b12532655671aff2b966a9be89b2625a715e8f
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Sep 18 09:18:32 2012 +0200

    change methodname and visbilty

commit 70396265025190ab2fbc159911ec3e064cc44fb2
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 17:26:52 2012 +0200

    fix fieldlist, refs PR #808

commit e9db96bfe163609eeefba430d8353c822aabacb0
Merge: 99b798f adb8142
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 16:26:40 2012 +0200

    Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3

commit adb8142d2694692ec71a063ac2ad1b275f3a67c9
Author: calinseciu <calinseciu@gmail.com>
Date:   Thu Aug 30 17:57:50 2012 +0300

    Add foreignKey to whitelist in saveAssociated()

    Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
    This happens if you don't send the foreignKey with the associated records data.
2012-11-02 10:56:49 +01:00
mark_story
1f31340a2a Fix issue with Model::saveAssociated() and TranslateBehavior
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.

Fixes #3272
2012-10-31 23:13:56 -04:00
Kyle Robinson Young
f10c669813 Code standards fixes 2012-10-29 08:14:17 -07:00
mark_story
c24bec679b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
euromark
0f978195d6 coding standards regarding whitespaces 2012-10-27 00:46:12 +02:00
Rachman Chavik
e61483126c CakeSchema: adds empty line between tables 2012-10-26 13:27:47 +07:00
Ber Clausen
c741f60367 Make Model::find('first') always return an array. 2012-10-25 17:57:37 -03:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
ADmad
1763f46340 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
Mark Story
746eaf9389 Merge pull request #894 from dereuromark/comp-fix-save-all
BC mod for saveAll()
2012-10-22 18:40:38 -07:00
mark_story
a0a61b5980 Fix issue where createSchema() would omit primary keys sometimes.
Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
c00d58b4ef Fixed problems with resetSequence() not using the correct sequence name
in postgres
2012-10-21 16:32:52 +02:00
mark_story
0b0b361e48 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
2012-10-20 20:48:11 -04:00
mark_story
08556ab879 Fix saveAssociated() with validate=first, atomic=false
When using the above options & validation errors on the associated
models, saving would not be aborted.

Fixes #3285
2012-10-20 15:12:05 -04:00
mark_story
888b1f4795 Fix issue with using contain() and query[contain]
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
2012-10-20 14:51:52 -04:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
3e0fa0009b Show the last 200 queries instead of the first 200.
Fixes #3273
2012-10-14 21:30:28 -04:00
euromark
1e2ac0b9c8 comp mod for saveAll()
better approach

test case to assert saveAll still behaves like previous versions
2012-10-11 14:03:59 +02:00
ADmad
f06bdde8c6 Fix docblock 2012-10-11 12:33:46 +05:30
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
Mark Story
4acc687dcd Merge pull request #890 from dereuromark/master-not-empty-validation
Fix validation error domain for notEmpty
2012-10-09 14:52:11 -07:00
ADmad
33a879ff41 Fix find('count') with 'group' when result has only one group. Closes #1677 2012-10-09 10:43:27 +05:30
ADmad
a1aa73c1a2 Cache character set names 2012-10-07 21:58:49 +05:30
euromark
e85b2a072a fix validation error domain for notEmpty
$this->_validationDomain for default notEmpty message

notEmpty default error message
2012-10-07 14:17:31 +02:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
James Michael DuPont
2d46fc60be Fixing undefined variable usage
Squash of pull request #872
2012-09-28 20:46:25 -04:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
0fc9a2c29c Update query building in TranslateBehavior.
* Reduce duplicate checks for Alias.*.
* Allow both the quoted and non quoted version of Alias.*

Fixes #3210
2012-09-25 21:01:19 -04:00
Jose Lorenzo Rodriguez
c870044262 Fixed typo 2012-09-25 17:05:41 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
cd99b7d6ff fixing error pointed out by dereuromark with recursive https://github.com/cakephp/cakephp/pull/846#commitcomment-1884073 2012-09-21 23:40:21 +01:00
dogmatic69
36314e6d37 converting if ($foo != "") to if ($foo) 2012-09-21 23:34:37 +01:00
dogmatic69
8dc4de5de8 converting if ($foo != false) to if ($foo) 2012-09-21 23:32:52 +01:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta
adding CakeNumber::formatDelta() and fixing issue with format()
2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7 adding a plugin propery to models wwith tests for ticket #85
Merge pull request #696
2012-09-20 21:31:31 -04:00
Ber Clausen
aaefbf1c2f Add MySQL FULLTEXT support.
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
2012-09-20 20:42:30 -04:00
mark_story
a9750264e4 Revert "Add MySQL FULLTEXT support."
This reverts commit 36c99a358f.
2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa Merge pull request #862 from bar/mysql-fulltext
Add MySQL FULLTEXT support.

Fixes #262
2012-09-20 17:20:23 -07:00
Ber Clausen
36c99a358f Add MySQL FULLTEXT support.
Minor optimizations and testing added.
2012-09-20 00:35:42 -03:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
ADmad
d12f50a2b6 Removing unneeded App::uses() calls 2012-09-20 02:40:54 +05:30
mark_story
99cbd22969 Fix coding standards. 2012-09-18 14:52:46 -04:00
mark_story
a1838a0c85 Implement missing bits for automatic sequence resetting.
Refs #3206
2012-09-18 14:12:23 -04:00
mark_story
55dcb9c3b3 Implement resetSequence()
This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
2012-09-17 20:50:05 -04:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
mark_story
d6e2b6f83e Re-format long lines. 2012-09-14 22:08:52 -04:00
Mark Story
89c98233b5 Merge pull request #843 from dereuromark/2.3-ticket-3172
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2 save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call 2012-09-15 02:33:05 +02:00
dogmatic69
f5a8eb6bbf ADmads comments 2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96 converting $foo == null / $foo == false to !$foo 2012-09-14 18:26:30 +01:00
mark_story
7d2cbec79d Revert "Fix null not stopping model callbacks."
This reverts commit 82a8400def.

The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
2012-09-13 22:49:17 -04:00
mark_story
82a8400def Fix null not stopping model callbacks.
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks.  This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.

Fixes #3123
2012-09-13 22:11:46 -04:00
mark_story
fb9360767e Make connection exceptions more helpful.
Fixes #3204
2012-09-12 22:31:07 -04:00
Kyle Robinson Young
bc40ac7d3f Remove unused variables and code 2012-09-05 17:19:13 -07:00
mark_story
6664acba79 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
200dd2dc9b Code standards fixes, unneeded break statements 2012-09-04 11:30:52 -07:00
mark_story
3cb501f1c5 Fix issue created in [e8b5d81fd7]
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.

Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
e8b5d81fd7 Fix quoting of field names containing -.
Fixes #3165
2012-08-31 14:25:02 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
mark_story
d4ee62be61 Add support for biginteger on SQLserver. 2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d Add bigint support for Sqlite.
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e Add bigint support for postgres 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
68116f7017 BIGINTs can also be primary keys 2012-08-30 14:48:59 +01:00
Tommy MacWilliam
15555a7309 added schema support for mysql bigints 2012-08-30 14:48:59 +01:00
Jose Lorenzo Rodriguez
f6278488af Ensuring list of behavior methods are refreshed between calls of
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf Fixing issues with validation rules not being reset after calling
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
mark_story
d66d37c92b Merge branch 'master' into 2.3 2012-08-24 22:50:29 -04:00
mark_story
b2f62f46c5 Fix failing tests in postgres. 2012-08-24 22:37:23 -04:00
Ceeram
f06ce1324d Merge branch '2.2-habtmmerge' 2012-08-24 10:45:45 +02:00
mark_story
dcc5a95482 Only split on ; for TABLE related statements.
Fixes #3142
2012-08-23 23:11:00 -04:00
Ceeram
cb80338c7d avoid duplication in return value when saving habtm 2012-08-24 00:50:46 +02:00
Ceeram
c5ebbc991c Revert "Merge pull request #784 from ceeram/habtmmerge"
This reverts commit fa5aa6278f, reversing
changes made to 88604ac757.
2012-08-23 16:00:41 +02:00
Ceeram
fb0053753e avoid duplication in returned results for habtm 2012-08-22 13:03:47 +02:00
mark_story
d5333a2ff1 Merge branch 'master' into 2.3 2012-08-20 16:20:27 -04:00
Stephen Cuppett
7e5f326300 Fix STRICT warnings on PHP 5.4 2012-08-19 17:00:26 -04:00
euromark
e1fbfcef00 fix contain for find method 2012-08-13 08:10:51 +02:00
mark_story
0bbf61ce3d Add removed getDataSource() call.
This fixes an issue where the wrong datasource could potentially be used
for getting the full table name.
2012-08-10 21:48:22 -04:00
euromark
bed5453be0 correcting order 2012-08-08 14:44:38 +02:00
euromark
5e0e850733 reduce 5-level if cases to 2 levels 2012-08-08 13:42:40 +02:00
mark_story
e59555a66f Merge branch 'master' into 2.3 2012-08-03 22:45:56 -04:00
mark_story
788cf52572 Fix saving empty values for translated fields with multiple locales 2012-08-03 22:40:38 -04:00
mark_story
c96e364cbb Fix incorrect expiry of sessions.
Fixes #3088
2012-08-02 21:03:53 -04:00
mark_story
cffc36e4e0 Fix notice error when impossible conditions are created.
Fixes #3084
2012-08-01 23:05:56 -04:00
Mark Story
2728c6253e Merge pull request #728 from boast/patch-2
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
2012-08-01 19:41:04 -07:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
27e2132a13 Generated SQL should not contain multi-column primary keys
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.

Fixes #3069
2012-07-27 22:31:49 -04:00
mark_story
162d3bcb29 Fix whitespace errors. 2012-07-23 22:44:05 -04:00
David Thalmann
f926ae7637 Clean up string concatenations and refactored some reused strings into variables.
Refs #GH-729

Signed-off-by: mark_story <mark@mark-story.com>
2012-07-23 22:30:28 -04:00
mark_story
ed19821168 Merge branch 'master' into 2.3 2012-07-22 21:01:28 -04:00
mark_story
e6ef218600 Fix associated translations being inserted.
Due to changes introduced in [1c0b6c076a]
associated translations would incorrectly be saved with a value of ''.

Fixes #3057
2012-07-22 20:59:24 -04:00
David Thalmann
78de6e276a Removed inline method calls in curly braced string concat's. 2012-07-22 03:40:49 +03:00
David Thalmann
d9b5ec1a3a Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field). 2012-07-21 22:07:51 +03:00
euromark
01f1b0dadc correcting previously added app uses statements 2012-07-21 20:29:49 +02:00
euromark
4fe1ab1bf6 missing app uses statements 2012-07-21 13:34:33 +02:00
mark_story
3c6b50953b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
Mark Story
83cef3ef9a Merge pull request #718 from dereuromark/2.3-fix-validation-error-message
2.3 fix validation error message
2012-07-17 19:57:16 -07:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
mark_story
a63dd9ee9d Fix incorrect formatting in TreeBehavior.
Fixes #3045
2012-07-17 21:06:41 -04:00
euromark
760cf33ce3 make sure a missing validation rule always triggers a warning (in productive mode this will be logged in the log files) 2012-07-17 10:47:20 +02:00
mark_story
a7c79e5da2 Fix warnings when deleting records that do not exist.
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
8fc5726920 Remove trailing whitespace. 2012-07-11 21:39:32 -04:00
Jose Lorenzo Rodriguez
39715bcd89 Adding missing afterValidate callback to behaviors, Fixes #3024 2012-07-10 20:35:26 -04:30
Thomas von Hassel
1c0b6c076a Update afterSave to ensure created entires have all translated fields present
Without all fields being present, find() will be unable to find the
translated records.

Fixes #3009
2012-07-07 12:03:29 -04:00
mark_story
eb7b66b37c Revert default value of allowEmpty.
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods.  Move some tests around and update tests that
probably should have been failing before.

Fixes #2983
2012-06-24 20:06:14 -04:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
Ceeram
71112d1225 No need to create new instance of ModelValidator when one is already created 2012-06-20 14:57:56 +02:00
Ceeram
60c611fa47 Parse rules in getField() 2012-06-20 14:54:32 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
cf18e8d38b avoid unneeded query in delete() 2012-06-19 16:08:36 +02:00
Ceeram
0df1e90eed show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925 2012-06-18 14:20:53 +02:00
mark_story
f625742a12 Make CakeSession use httponly by default.
Fixes #2955
2012-06-12 22:10:55 -04:00
Kyle Robinson Young
54745aada9 Fix custom validation methods with CakeValidationSet 2012-06-11 23:28:45 -07:00
mark_story
f3464b002f Remove duplicate code.
Use a shutdown function to close the session off.
This removes a bit of icky code and continues to allow
objects to be used as session handlers.
2012-06-06 21:01:16 -04:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e Fixing yet another issue related to beforeValidate and
validateAssociated
2012-06-06 10:07:01 -04:30
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Ceeram
048dc8d254 casting schema to array, fixes error for array_keys when return is null 2012-06-02 01:39:53 +02:00
Jelle Henkens
e5eb7b490e Preventing cache collisions by adding the the datasource key 2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605 Replacing crc32 with md5 for less collisions in method caching 2012-06-01 10:42:26 +01:00
mark_story
55c4ad3c1c Fix coding standards errors.
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
mark_story
9a8ceaeba6 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
0bfcd49249 Fix unbindTranslation not unbinding.
There were documented use cases that have never worked.  Fix that.
Also rename a method so it better describes what it does.

Fixes #2913
2012-05-27 21:25:55 -04:00
mark_story
115b2c1495 Rename joined to _joined to hopefully prevent issues. 2012-05-27 20:43:15 -04:00
Majna
ce2fc6c83d Improve belongsTo and hasOne for unneeded queries when recursive > 1.
Reuse already joined data for 'belongsTo' and 'hasOne' associations instead of running unneeded queries for each record.
Fixes #47
2012-05-27 23:15:20 +02:00
mark_story
4b8c469004 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
mark_story
b27a3aab7b Set session.gc_maxlifetime by default.
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings.  Always set session.gc_maxlifetime so session files are
garbage collected correctly.

Fixes #2901
2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77 Fix array arguments being translated.
Fixes #2902
2012-05-23 21:02:41 -04:00
Jelle Henkens
ecd869d4e3 Changing int to integer 2012-05-22 16:34:07 +01:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
Jose Lorenzo Rodriguez
9cceb1553f Improving ModelValidator::add() to allow multiple rules to be defined at once 2012-05-20 18:51:00 -04:30
mark_story
16a1a0ee79 Fix coding standards. 2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64 Merge branch '2.2-validator' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e Merge branch '2.1' into 2.2 2012-05-20 14:53:41 -04:00
Jose Lorenzo Rodriguez
16847b0d97 Backporting changes form 2.2 to fix some edge cases on deep saving. Fixes #2879 2012-05-19 21:14:23 -04:30
Jose Lorenzo Rodriguez
dc8c731ccb Fixed failing test case 2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6 Merge branch '2.1' into 2.2-validator
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2 make sure model data is moved to alias, even when first key in data is assoc model
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
Jelle Henkens
dbd826f794 Removing extra space in the extract() calls 2012-05-13 10:37:50 +01:00
ADmad
eeff950cf9 Removing default null value for $data parameter. Refs GH pull request #646 2012-05-12 00:18:47 +05:30
Jose Lorenzo Rodriguez
217bf85537 Implemented new method isEmptyAllowed in CakeValidationRule 2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
785cf8354c Fixing merge artifacts to make all tests pass 2012-05-10 22:36:55 -04:30
Jose Lorenzo Rodriguez
307197da9e Merge branch '2.2' into 2.2-validator
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-05-10 22:19:35 -04:30
Jose Lorenzo Rodriguez
efc3536adb Fixing a couple errors introduced in previous commit 2012-05-10 22:04:55 -04:30
Jose Lorenzo Rodriguez
2b7c2ad691 Fixing doc blocks for CakeValidationRule and changing visibility for some methods 2012-05-10 21:51:54 -04:30
Jose Lorenzo Rodriguez
34531d9d7c Cahnging doc in header for CakeValidationSet 2012-05-10 21:41:42 -04:30
Jose Lorenzo Rodriguez
c4202b7b22 Improving docs for CakeValidationSet 2012-05-10 21:39:53 -04:30
Jose Lorenzo Rodriguez
8c9c6b4a5a Improving docs for ModelValidator 2012-05-10 21:27:01 -04:30
Jose Lorenzo Rodriguez
280893155a Renaming CakeRule to CakeValidationRule 2012-05-10 21:01:44 -04:30
Jose Lorenzo Rodriguez
f06fbb0075 Making validateAssociated overwrite data consistently with validateMany 2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
82e87791f6 Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data 2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
1481f82ec1 Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference 2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87 Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks 2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
e4c88d8cf9 Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
This reverts commit 0f54758e5a, reversing
changes made to b4a42e4a03.
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
2cea668755 Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
This reverts commit b4a42e4a03, reversing
changes made to 6bd7da36e7.
2012-05-10 20:55:46 -04:30
Christian Winther
ad4e46150a Fixing saveMany 2012-05-10 20:55:46 -04:30
Christian Winther
fbd2132300 Another fix for Pull request 642 2012-05-10 20:55:46 -04:30
Christian Winther
7a1275a1b1 Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
This allow changes in beforeValidate to be saved
2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987 Fix additional issues with saveAll().
Fixes #2857
2012-05-10 20:55:46 -04:30
mark_story
8334ebebed Fix saving translate records with saveAll()
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
2012-05-10 20:55:45 -04:30
Jose Lorenzo Rodriguez
b54dc69f64 Making validateAssociated overwrite data consistently with validateMany 2012-05-10 00:52:54 -04:30
Jose Lorenzo Rodriguez
6da2fe8323 Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data 2012-05-10 00:47:35 -04:30
Jose Lorenzo Rodriguez
00a34f14fe Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference 2012-05-10 00:07:05 -04:30
Jose Lorenzo Rodriguez
0fb025f6dc Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks 2012-05-09 23:51:27 -04:30
Jose Lorenzo Rodriguez
12ae03b876 Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
This reverts commit 0f54758e5a, reversing
changes made to b4a42e4a03.
2012-05-09 17:58:08 -04:30
Jose Lorenzo Rodriguez
07bf73e88f Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
This reverts commit b4a42e4a03, reversing
changes made to 6bd7da36e7.
2012-05-09 17:57:48 -04:30
Christian Winther
e8fce37a65 Fixing saveMany 2012-05-09 23:59:02 +02:00
AD7six
8060dd57d3 don't dump indexes all on the same line 2012-05-09 23:38:30 +02:00
AD7six
0c4613fdd2 prevent NULL in fixture files 2012-05-09 23:38:29 +02:00
Christian Winther
3b154fa325 Another fix for Pull request 642 2012-05-09 23:34:37 +02:00
Christian Winther
45a86a8b20 Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
This allow changes in beforeValidate to be saved
2012-05-09 22:57:21 +02:00
mark_story
fbba3621b5 Fix additional issues with saveAll().
Fixes #2857
2012-05-07 21:36:28 -04:00
Jose Lorenzo Rodriguez
52c7b2383c Added afterValidate callback to maintain consistency across all other callbacks in the model layer 2012-05-06 23:38:29 -04:30
Jose Lorenzo Rodriguez
d4511af27b Implemented add and remove in ModelValidator 2012-05-06 23:06:28 -04:30
Jose Lorenzo Rodriguez
a7222bccd6 Implemented removeRule in CakeValidationSet 2012-05-06 22:30:07 -04:30
mark_story
6c5255ac73 Fix saving translate records with saveAll()
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
1ff1af35b3 Fixing typo 2012-05-06 20:45:50 -04:30
Jose Lorenzo Rodriguez
ff91a0909a Implemented countable interface for CakeValidationSet 2012-05-06 01:07:13 -04:30
Jose Lorenzo Rodriguez
989a8b8398 Implementing IteratorAggregate for CakeValidationSet 2012-05-05 21:13:09 -04:30
Jose Lorenzo Rodriguez
6f16a66b83 Implmenting ArrayAcces in CakeValidationSet 2012-05-05 21:00:40 -04:30
Jose Lorenzo Rodriguez
877e6c0f66 Removing the need for first param in CakeRule constructor 2012-05-05 19:41:48 -04:30
Kim Egede Jakobsen
d180f6c3e5 Changed some of the doc-block links.
!But think there is a mistake somewhere with the links!
Camel-case or lowercase?

doc block content -> working link
(Model.php)
\#useTable        -> \#usetable
\#displayField    -> \#displayfield
\#cacheQueries    -> \#cachequeries

\#sortByKey       -> \#sortByKey (equals - basic.php)
2012-05-06 01:44:27 +02:00
Jose Lorenzo Rodriguez
3199b9029b Implemented countable interface for ModelValidator 2012-05-05 17:46:09 -04:30
Jose Lorenzo Rodriguez
81c0c3d91d Implementing IteratorAggregate interface for ModelValidator 2012-05-05 17:34:35 -04:30
Jose Lorenzo Rodriguez
d35f8e6b00 Implementing ArrayAccess in ModelValidator 2012-05-05 15:52:02 -04:30
Jose Lorenzo Rodriguez
b6c8a345e7 Renaming CakeField to CakeValidationSet 2012-05-05 13:44:12 -04:30
Jose Lorenzo Rodriguez
843d95bb77 Renaming some methods ands removing others 2012-05-05 13:34:14 -04:30
mark_story
128c719bd0 Add no-op method to base class.
Fixes #2839
2012-04-30 20:52:17 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Jose Lorenzo Rodriguez
05abff6ecd Fixing faling test case 2012-04-29 19:58:22 -04:30
Jose Lorenzo Rodriguez
72e8992c25 Improving test coverage for CakeRule 2012-04-29 19:56:24 -04:30
Jose Lorenzo Rodriguez
d348bf6807 Refactoring again CakeRule, making all tests pass 2012-04-29 18:11:51 -04:30
Jose Lorenzo Rodriguez
94040859b2 Correctly calling method to not depend on functon call order 2012-04-29 02:57:10 -04:30
Jose Lorenzo Rodriguez
deedd7a3ce Even more tests passing now, almost there 2012-04-29 02:40:08 -04:30
Jose Lorenzo Rodriguez
8700f3c7a2 Fixed some validation tests 2012-04-29 01:06:24 -04:30
Jose Lorenzo Rodriguez
18c26119f3 Removing redundant code, cleaning up some sentences 2012-04-29 00:39:43 -04:30
Jose Lorenzo Rodriguez
c31f87b7a1 Refactored getMethods, got rid of validationErrors property in ModelValidator, made validateAssociated and many tests
pass
2012-04-29 00:24:35 -04:30
Jose Lorenzo Rodriguez
b83f936e83 General refactor on ModelValidation to decrease class coupling and increase readability 2012-04-28 23:25:05 -04:30
Jose Lorenzo Rodriguez
573d292ffa Fixed more refereces to old method 2012-04-28 20:12:20 -04:30
Jose Lorenzo Rodriguez
4519ba1221 Fixed variable reference 2012-04-28 20:05:41 -04:30
Jose Lorenzo Rodriguez
3ea2d7bca5 Removing validatior construction in model constructor 2012-04-28 20:04:33 -04:30
Jose Lorenzo Rodriguez
f54eb0cdee following coding standards and simplifying some logic 2012-04-28 19:38:18 -04:30
Jose Lorenzo Rodriguez
8eb02d0539 Simplifying options for setting/getting a model validator. Adding loading support for validators is was simplified into
requiring custom validators to extend core ModelValidator
2012-04-28 19:20:22 -04:30
Tigran Gabrielyan
77f6d88a9e Fixed bug in model validation translate 2012-04-26 21:24:22 -07:00
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Juan Basso
333ea29805 Renamed variable name from nested transaction 2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0 Renamed method to check if the driver supports nested transaction. 2012-04-26 20:58:25 -04:00
Ceeram
ec9966ec6b Adding tests for Validator 2012-04-25 09:38:58 +02:00
Thomas Ploch
324684c14f Moving all validation logic into a new ModelValidator object. 2012-04-25 08:53:31 +02:00
Juan Basso
f6288a491a Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications. 2012-04-24 21:42:32 -04:00
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Juan Basso
7fe333ce4e Merge branch '2.2-nested-transaction' into 2.2 2012-04-22 23:04:32 -04:00
ADmad
b1e7164d1a Implemented translation of validation rule arguments in validation error messages. Closes #2816 2012-04-22 23:25:07 +05:30
Ceeram
f0bd7386e2 created, modified and updated fields now use static timestamp in testcases 2012-04-21 17:38:49 +02:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
Ceeram
388b20dd9d fix error in previous commit 2012-04-17 00:22:13 +02:00
Ceeram
a84597784d avoid warning when saveAll() data has empty hasMany data, fixes #2792 2012-04-16 22:46:58 +02:00
Ceeram
9556ff714d Avoid running validation again, when saveAll() is called with 'validate' => 'first' 2012-04-16 09:45:44 +02:00
mark_story
d136fac219 Correct docs to match code.
Fixes #2790
2012-04-15 20:33:43 -04:00
Juan Basso
7be5349b0c Added configuration to disable nested transaction, even if the db supports it. 2012-04-14 16:43:24 -04:00
Juan Basso
a512d46679 Sqlite is failing in PHP 5.2, re-adding the check for driver support. 2012-04-14 16:23:51 -04:00
Juan Basso
2c1cf29aa3 Added real support to nested transactions for Mysql, Postgres, Sqlite. 2012-04-14 16:21:42 -04:00
Juan Basso
2c9399a78a Removed unused attribute and moved getVersion to be reused in all PDO drivers. 2012-04-14 16:21:41 -04:00
Mark Story
6167529d4d Merge pull request #605 from shama/patch-datasource-test
Add checks for startQuote & endQuote.

Fixes #2769
2012-04-14 08:08:05 -07:00
mark_story
b9389c9da1 Fix comment's reference to version numbers. 2012-04-14 10:50:31 -04:00
mark_story
2fd15b6c7e Revert removal of session_cache_limiter()
It was removed in [4a6159c9af].
The session_cache_limiter() is required for IE8 to correctly
hold onto sessions.

Fixes #2781
2012-04-14 10:04:56 -04:00
Kyle Robinson Young
6cf73c763c Tests for a generic custom datasource
Default startQuote and endQuote to avoid error with non-database datasources
2012-04-11 10:08:45 -07:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
2333c8f33f Re-factor duplicated code. 2012-04-10 21:05:42 -04:00
mark_story
f8966a64f2 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
Mark Story
da9cbcf7bb Merge pull request #603 from luisarmando/queryCacheDoc
Fix doc of DboSource->$_queryCache.
2012-04-09 14:35:57 -07:00
Luís Armando
bb2286bc43 Fix doc of DboSource->$_queryCache. 2012-04-09 13:30:58 -03:00
mark_story
8d1b5c3f24 Fix notice errors with postgres. 2012-04-07 17:22:27 -04:00
mark_story
15c94dee4d Fix whitespace and remove duplicate method calls. 2012-04-07 14:42:25 -04:00
mark_story
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
Ceeram
c2a8fca00c Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
30268f6a08 Only check for existing method expresion() when it actually will be called.
Datasources that use calculate() should not be forced to implement expression() as well
2012-04-05 23:15:18 +02:00
mark_story
5c590aad09 Add missing ClassRegistry import.
Fixes #2757
2012-04-05 08:33:12 -04:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
ADmad
1cc5206442 Merge branch '2.1-dbosource' into 2.1 2012-04-04 19:58:48 +05:30
ADmad
93639a7c43 Fixed bug where associated model's afterfind was not triggered in particular case 2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6 Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750 2012-04-04 15:07:45 +02:00
ADmad
7ed90c72ae Updating API docblock for Model::query() 2012-04-03 19:06:41 +05:30
mark_story
72cb96b727 Fix a few more coding standards errors. 2012-04-02 23:23:53 -04:00
Ceeram
34a730dfd8 ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709 2012-04-02 18:48:02 +02:00
mark_story
4e67698506 Fix issues with SQLServer + boolean columns.
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
2012-04-01 22:10:05 -04:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
Kyle Robinson Young
e2a46f76c7 substr() optimizations 2012-03-28 13:07:26 -07:00
mark_story
a76a926ac1 Fix more uses of Set -> Hash 2012-03-26 22:32:57 -04:00
mark_story
17bfbbb9df Port over Set to Hash usage. 2012-03-26 22:32:55 -04:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
mark_story
29048b3bb7 Update to use Hash.
Update CakeSession & Configure to use Hash.
2012-03-26 22:25:41 -04:00
Jose Lorenzo Rodriguez
b373309ba9 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Thomas Ploch
fda065101b Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
dogmatic69
7c697eb9be adding an extra check to only type cast if its a int/true/false so you can still use fields etc in the queries 2012-03-23 21:21:18 -04:00
Ceeram
817015e6b3 remove unneccesary elseif 2012-03-23 16:37:02 +01:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Ceeram
4a6159c9af session_cache_limiter() removed, it was set to invalid value as well
Also remove setting P3P header
2012-03-23 16:31:26 +01:00
Kyle Robinson Young
21c4967cc6 App::uses the File Utility as write() uses File 2012-03-22 23:48:57 -07:00
mark_story
20bdf1d7b0 Add escaping to table names.
SQLite was not quoting table names, so tables with
keywords caused errors.

Fixes #2702
2012-03-21 21:04:34 -04:00
Ceeram
c9528b8446 Merge branch '2.1' into 2.2 2012-03-21 11:19:08 +01:00
Ceeram
4dfbfe9c8b fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array 2012-03-21 10:38:04 +01:00
mark_story
01e035f726 Move logic to afterDelete.
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.

Fixes #2699
2012-03-20 22:36:48 -04:00
Mark Story
3abb7d966b Merge pull request #569 from tPl0ch/2.2-datasource-close
Adding basic implementation of DataSource::close().
2012-03-20 18:06:00 -07:00
Ceeram
091ad53b80 ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type 2012-03-19 13:27:26 +01:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
ADmad
bdddc85946 Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats. 2012-03-18 13:43:21 +05:30
mark_story
544930f882 Skip validation when recovering trees.
Fixes #2663
2012-03-16 21:57:20 -04:00
Thomas Ploch
a06eba7e24 Adding basic implementation of DataSource::close().
Since this method will be called in Destructor.
2012-03-16 21:08:48 +01:00
dogmatic69
2ad0f8b8db setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779 2012-03-13 17:40:25 +00:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
5687d97a98 Merge branch '2.1' into 2.2 2012-03-12 20:31:33 -04:00
Simon Males
791cc1a657 array_merge inappropriate for certain column types. e.g. Switching from VARCHAR(45) to DATETIME will carry length, collate and charset properties 2012-03-12 21:30:52 +11:00
Ceeram
a4952166f7 make acl methods available in permission model 2012-03-11 17:07:42 +01:00
mark_story
8c611b236d Fixing missed cache reads for table schema.
Because cache keys were different, model schema would not be read from
the cache.  Make keys used consistent.

Fixes #2670
2012-03-11 10:24:05 -04:00
Ceeram
bbfaa9e947 Paginating now work well with custom find methods.
_findCount() will now pass $query['operation'] = 'count' for more flexibility.
Custom finders can distinguish the operation and return other $query if needed.
2012-03-11 15:14:50 +01:00
mark_story
83a29f054e Fix Session.cookieTimeout default behavior.
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.

Fixes #2669
2012-03-11 08:14:54 -04:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
9a6ad7e1e2 Fixing most coding standard issues in Model/ 2012-03-04 21:51:50 -05:00
Ceeram
08a4d0bf63 Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds 2012-03-03 23:55:03 +01:00
ADmad
12364cac8c Fixed indentation 2012-02-28 02:04:43 +05:30
mark_story
0568746bfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
faeb7b4536 Fix error creating schema files.
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.

Fixes #2618
2012-02-26 10:25:39 -05:00
mark_story
7665f369fa Merge branch '2.1-type-hinting-corrections' into 2.1 2012-02-25 20:07:18 -05:00
euromark
45112088a1 type hinting models 2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e visibility attributes 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
ADmad
4edb378ef8 Added ability to pass ID as parameter to Model::exists() 2012-02-24 19:42:23 +05:30
Mark Story
94db313e39 Merge pull request #516 from dogmatic69/tree-behavior-optimization
Tree behavior optimization

Fixes #2600
2012-02-23 09:27:41 -08:00
dogmatic69
c02912261b setting recursive to -1 2012-02-23 11:36:44 +00:00
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
dogmatic69
74a84c96f1 optimization of tree behavior as per ticket #2600 2012-02-23 00:56:20 +00: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
mark_story
2097d5a968 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:10:14 -05: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
AD7six
5608d63541 allow set nest to work with any-d arrays
not just model-formatted arrays
2012-01-10 01:24:20 +01:00
AD7six
442d889f99 move the paths used into options 2012-01-10 00:48:36 +01:00
AD7six
7b640b8123 move find threaded logic to the set class 2012-01-10 00:24:38 +01:00
mark_story
0e56d742b8 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
3c48552f81 Fix error with more case-sensitive databases. 2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a Fix issue with find(count) and translated conditions.
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
850dbb9453 More explicit fetch mode in Mysql datasource 2012-01-08 18:46:42 -04:30
Jose Lorenzo Rodriguez
67d18b0c59 Making sure the Validation class exists before checking methods on it 2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0 Initializing CakeSession class only when required, mixing procedural code with class definitions is not good 2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77 Extracting the CakeSessionHandlerInterface into its own file 2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5 Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage 2012-01-07 18:06:02 -04:30
mark_story
beced84d2d Fix illegal offset caused by TranslateBehavior.
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
2012-01-07 11:58:35 -05:00
Jose Lorenzo Rodriguez
ba097d404f Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks 2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba Fixing a couple failing tests on windows using sqlserver 2012-01-07 00:37:50 -04:30