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
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
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05: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
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
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
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
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
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
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
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
Frank de Graaf
ab89f6ec97
Makes DboSource less string dependent.
2013-10-22 16:43:32 +02: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
7fb51ab50f
Decimal support for MySQL. #3171
2013-09-28 09:23:46 +08:00
euromark
17bd465cae
simplify tests
2013-09-19 00:17:21 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
Mischa ter Smitten
0e49a23065
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 22:32:04 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
euromark
6c1e60953b
fix cs
2013-08-03 03:02:52 +02:00
Marc Würth
1cac1846a3
Added missing calls to setUp & tearDown in tests
2013-07-29 01:52:39 +02:00
euromark
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
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
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
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
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
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
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +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
mark_story
8b0a7ee13d
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-12-07 20:53:10 -05:00
mark_story
002700071d
Fix incorrectly quoted fields when using the || operator.
...
Fixes #3404
2012-12-02 20:59:56 -05:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00