euromark
7a287a6942
More coding standard corrections.
2014-04-29 14:19:33 +02:00
euromark
8e0f15b3d6
Revert the removal of a BC relevant part.
2014-04-10 20:11:58 +02:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
euromark
44952b06a4
cs
2014-04-02 02:23:43 +02:00
mark_story
ff73229ab8
Fix failing tests.
...
Not everyone uses the same database names as me.
2014-03-24 10:04:19 -04:00
mark_story
2fe8c4050b
Insert manual joins *after* generated joins.
...
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.
Refs #2179
Refs #2346
2014-03-23 21:09:08 -04:00
mark_story
6c3bc48ce0
Merge branch 'master' into 2.5
2014-03-06 17:45:00 -05:00
ndm2
70a1b87db6
Fix wrong test model association class name
2014-03-01 23:01:33 +01:00
ndm2
008ad3237c
Fix verification of expected invocations #2919
2014-03-01 19:06:17 +01:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
mark_story
96a37d5917
Fix temporary associations that replace fields not being restored.
...
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.
Fixes #2816
2014-02-11 21:56:05 -05:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
José Lorenzo Rodríguez
e36c954da7
Merge pull request #2693 from ADmad/2.5-session-start
...
Don't start a session if it's known to be empty.
2014-02-01 04:08:48 -08:00
Rachman Chavik
59549b7ebe
Fix: Changing boolean to integer for Postgres
...
Closes #2751 , CakeDC/migrations#149
2014-01-31 15:14:20 +07:00
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
Mark Story
5629dfdcc3
Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebehavior
...
Fix Model::field() and TranslateBehavior::beforeFind() not working together.
Fixes #2721
2014-01-29 06:40:27 -08:00
joostdekeijzer
987187ef8c
Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname')
2014-01-29 13:37:47 +01:00
joostdekeijzer
827c815cf1
correct property comment
2014-01-29 12:25:09 +01:00
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
mark_story
61dd1c3f9d
Fix trailing whitespace.
2014-01-21 20:23:12 -05:00
ADmad
84932fcc4a
Don't start a session if it's known to be empty.
...
If an app only reads/checks the session there's no need to start a
session to know that the read/checked session value is empty.
Fixes #1981
2014-01-22 01:17:16 +05:30
mark_story
55e1619c59
Fix issue with find(count) and TranslateBehavior.
...
Fixes #2667
2014-01-18 21:54:09 -05:00
Rob McVey
7a27650297
Test case that demonstrates issue with count and Translate
2014-01-18 21:49:07 -05:00
mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
euromark
690f54ad9d
more corrections in order
2014-01-10 00:33:27 +01:00
euromark
3ff23c732f
unify and correct assert order
2014-01-10 00:18:08 +01:00
euromark
738b34c2d0
Correct assert param order
2014-01-09 16:50:27 +01:00
mark_story
b20ca3f4e0
Fix errors with postgres tests.
2014-01-08 09:42:13 -05:00
mark_story
3763350667
Add test for issue #2595
...
Fold conditions that did the same thing and add a test case.
Closes #2595
2014-01-06 21:21:13 -05:00
mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Rachman Chavik
c48afae2dc
Add test to prove issue when saving invalid tree data
2013-12-27 12:35:28 +07:00
mark_story
1daa27c0d7
Add tests for uncovered case of :0 replacements.
...
There were previously no tests for the :0, :1 style replacement markers
in DboSource. In fact I didn't even know it was a 'feature'.
2013-12-24 13:13:05 -05:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
OKINAKA Kenshin
3433e10fbd
Fix Postgres for bigint primary key.
2013-12-18 14:58:18 +09:00
mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
mark_story
3b867a048e
Add test for saveMany + validate=false.
...
Closes #2468
2013-12-11 12:43:18 -05:00
José Lorenzo Rodríguez
6358741944
Merge pull request #2449 from cakephp/fix-session-cyclic-error
...
Fixed error in CakeSession that would call start() in an infinite loop
2013-12-09 02:18:21 -08:00
mark_story
48d2618c62
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Routing/Router.php
2013-12-08 21:25:59 -05:00
mark_story
abf4af14a8
Change quotes to keep postgres happy.
2013-12-08 11:58:26 -05:00
mark_story
530c95725f
Attempt to fix errors with postgres tests.
2013-12-08 11:46:17 -05:00
Rachman Chavik
98e645a1ea
Add test to prove issues with deleteAll with $order set
2013-12-08 16:39:56 +07:00
Jose Lorenzo Rodriguez
848a0ce217
Fiexed error in CakeSession that would call start() in an infinite loop
...
when the session is marked as invalid
2013-12-07 22:25:33 +01:00
ADmad
f3900e89fd
Fixed bug where deleteAll tried to delete same id multiple times.
...
Ensure find done in deleteAll only returns distinct ids. A wacky
combination of association and conditions can sometimes generate
multiple rows per id.
2013-12-03 22:18:17 +05:30
mark_story
97ab2c0e9b
Merge branch 'imsamurai-2.5' into 2.5
...
Add unsigned integer support to MySQL. Unsigned integers have not been
added to other databases as they either do not support them (postgres,
sqlserver) or they are 'faked' and don't do anything (sqlite).
Fixes #2321
2013-11-27 20:12:28 -05:00
imsamurai
62a53d26bb
fix typo
2013-11-22 16:17:25 +02:00
mark_story
71312932e8
Merge branch 'master' into 2.5
2013-11-21 21:46:21 -05:00
José Lorenzo Rodríguez
df5fc2304a
Merge pull request #2289 from bar/2.5-optimize-dbosource
...
First part of the DboSource cleanup.
2013-11-21 01:02:36 -08:00
mark_story
ec38ee1c48
Only enable cacheSources if both the datasource + model agree on it.
...
This prevents models from flipping cacheSources on when the datasource
has it disabled already.
Refs #2364
2013-11-19 17:36:20 -05:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7
formatting app::uses blocks (refs #2265 )
2013-11-18 11:56:00 +01:00
imsamurai
20dc92291e
fix broken test
2013-11-17 23:34:22 +02:00
imsamurai
0286e4120d
fix code style
2013-11-17 23:12:51 +02:00
imsamurai
8bcfe452da
not add unsigned
to not numeric fields, fix broken test, add new test
2013-11-17 23:10:53 +02:00
imsamurai
2f6122cb01
add unsigned
property in Model::describe
2013-11-17 22:37:01 +02:00
imsamurai
00fb663f90
remove numeric
from unsigned
config
2013-11-17 21:23:13 +02:00
mark_story
016c3aed44
Add test for saveAssociated and expression objects.
...
Add a test for #1514 . This issue was fixed during recent refactorings.
Closes #1514
2013-11-16 10:51:14 -05:00
Mark Story
17ae40f0ce
Merge pull request #2319 from ravage84/php-5-removal
...
Removed "PHP 5" from file header DocBlocks
2013-11-14 06:41:31 -08:00
imsamurai
f1a2c1a75c
add decimal type for unsigned
2013-11-14 10:56:51 +02:00
imsamurai
15805e668e
fix phpcs errors
2013-11-14 02:39:16 +02:00
imsamurai
87fef89737
fix phpcs errors
2013-11-14 02:19:31 +02:00
imsamurai
fd64d952b5
change position from afterDefault to beforeDefault during to wrong order, add test
2013-11-14 01:36:27 +02:00
imsamurai
e35823e72a
fix tests, add numeric type for unsigned
2013-11-14 01:33:11 +02:00
imsamurai
5a40944a6f
fix test name testBuildColumn3 to testBuildColumnUnsigned
2013-11-14 01:20:21 +02:00
imsamurai
2fcb4c3c6c
- change check to strict for options
of $fieldParameters
...
- add `types` parameter and strict check if it present in `$fieldParameters` (if it present and not contain column type field parameter will be skipped)
- add `noVal` parameter to `$fieldParameters` if it present and not empty value of this parameter from column will be ignored
- add `unsigned` column type for integer, float and biginteger. If it set to `true` an 'UNSIGNED' will be add in sql column part, if not set or set not to `true` this parameter will be skipped
2013-11-14 01:11:30 +02:00
Marc Würth
7018997979
Fixed some copyright and license statements in the file header DocBlocks
2013-11-14 00:07:03 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
ce47890e98
Replaced all remaining license references to the Open Group Test Suite License with the MIT License
2013-11-13 18:52:06 +01:00
Ber Clausen
b35c9671ad
Explicitly build SQL statements, calling buildAssociationQuery().
2013-11-11 23:27:50 -03:00
Ber Clausen
64f34b75a2
Fix a couple of failing tests.
2013-11-11 23:27:50 -03:00
Ber Clausen
53c6df554c
Remove unused $resultSet argument from generateAssociationQuery().
2013-11-11 23:27:50 -03:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Robert Sworder
456645d7ad
Update tests for incorrect containable behaviour if a model only finds 1 field.
2013-10-25 15:15:52 +01:00
Marc Würth
3773311cc0
Normalized associated models in unbindModel.
...
Resolves #1764
Had to cast $models to an array since ``Hash::normalize()`` doesn't support strings which ``Set::normalize()`` does (but which is deprecated).
Reused existing tests.
2013-10-24 15:28:31 +02:00
Frank de Graaf
ab89f6ec97
Makes DboSource less string dependent.
2013-10-22 16:43:32 +02:00
mark_story
5a394c379a
Merge branch 'master' into 2.5
2013-10-14 22:57:50 -04:00
Mark Story
ce74153389
Merge pull request #1691 from uzyn/2.5-decimal
...
Add support for decimal type in Schema.
Fixes #3171
2013-10-14 08:36:15 -07:00
euromark
1cb24ae537
CS fixes using phpcs-fixer auto-correction.
2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Jose Lorenzo Rodriguez
9673048c30
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
2013-10-12 01:03:20 +02:00
Jose Lorenzo Rodriguez
63b65e2f69
Fixing CS
2013-10-12 00:58:14 +02:00
José Lorenzo Rodríguez
8cdbafd312
Merge pull request #1631 from ovidiupruteanu/patch-2
...
flushMethodCache not working if called before cacheMethod
2013-10-11 15:56:19 -07:00
Bryan Crowe
81c2e9db84
Capitalize UUID acronym
2013-10-08 21:46:30 -04:00
euromark
b5bd087bc5
Replace deprecated methods.
2013-10-08 20:23:57 +02:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
euromark
381a8c1216
Simplify test.
2013-10-08 00:47:47 +02:00
euromark
35ca40635e
Add doc block
2013-10-08 00:32:11 +02:00
euromark
c621985f69
Fix whitelist to be modifiable from behaviors to work with validate.
2013-10-07 23:45:27 +02:00
euromark
7b57df5554
Correct method names and missing parent calls.
2013-10-07 20:24:28 +02:00
ovidiupruteanu
dd3b1e41bc
Test case for DboSource::flushMethodCache
2013-10-01 21:34:40 +03:00
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
c74c8d49a1
Decimal support for SQLite. #3171
2013-09-28 14:36:55 +08:00
U-Zyn Chua
e0eb8f8e18
Added decimal CakeSchema test case and DatatypeFixture. #3171
2013-09-28 14:29:39 +08:00
U-Zyn Chua
a1a3e70039
Decimal support for PostgreSQL. #3171
2013-09-28 14:07:00 +08:00
mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04:00
U-Zyn Chua
7fb51ab50f
Decimal support for MySQL. #3171
2013-09-28 09:23:46 +08:00
euromark
9a86f7e883
correct spelling mistake
2013-09-27 20:28:03 +02:00
Frank de Graaf
41a7739b69
Merge pull request #1686 from andydhobbs/ticket-4108
...
Fixes bad merge of #1683 .
Refs #4108 .
2013-09-27 05:53:10 -07:00