mark_story
3cee3b0e99
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
Stephen Cuppett
ed749fdc97
Must double quote the schema name in query
...
Schema names with reserved words such as "create" will fail this query without double quotes.
Attempted prepared statement with ? placeholder. This failed with the following CakePHP error:
Error: A Database connection using "Postgres" was missing or unable to connect.
The database server returned this error: SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "$1" LINE 1: SET search_path TO $1 ^
2013-12-29 21:43:56 -05:00
Ber Clausen
f30b43b4c9
Update documentation and typehint.
2013-12-21 22:02:45 -03:00
Ber Clausen
c15f7de164
Re-expose DboSource::fetchAssociated() for BC.
...
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
2013-12-21 11:34:40 -03:00
Ber Clausen
5ccb77e25d
Be consistent with the result set variable name.
2013-12-21 10:57:40 -03:00
Ber Clausen
0adc062cfa
Process query only when needed.
2013-12-21 10:57:40 -03:00
Ber Clausen
422be67a03
Avoid recalculating whether the relationship is a self join.
2013-12-21 10:57:40 -03:00
Ber Clausen
86b69964ef
Be more semantic with variable names.
...
Isue less loockups for deep arrays.
A bit of documentation added.
2013-12-21 10:57:40 -03:00
Ber Clausen
7a378c3b22
Conveniently fetch hasAndBelongsToMany associations from within a function (like hasMany).
...
Variable names should represent their values.
Remove unnecessary references.
2013-12-21 10:57:38 -03:00
Ber Clausen
60a8f0900b
Get Model associations only when needed.
2013-12-21 10:49:22 -03:00
Ber Clausen
8355d32bb1
Be more semantic indicating that association fields must be empty.
2013-12-21 10:49:22 -03:00
Mark Story
99c8503578
Merge pull request #2518 from bar/2.5-dbosource-getconstraint
...
Document DboSource::getConstraint().
2013-12-21 05:43:52 -08:00
Ber Clausen
5860cd4b8e
Still more documentation.
2013-12-21 07:04:45 -03:00
Ber Clausen
c5c8cb80ba
Document DboSource::getConstraint().
...
Also, update the function signature (to be compliant with other
functions) and type hint $LinkModel.
2013-12-21 06:24:23 -03:00
Ber Clausen
09188cc3d0
More documentation.
2013-12-21 06:11:31 -03:00
Ber Clausen
c1cdf190e3
Add documentation. Strict check.
2013-12-21 05:41:23 -03:00
Ber Clausen
1bdb783f91
Update documentation.
2013-12-21 05:39:42 -03:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
mark_story
df4b978ce4
Clarify the docs for DboSource::fetchAll()
...
Refs #2508
2013-12-19 17:39:44 -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
Ber Clausen
2d67604182
Add more Model type hints, and ease the model testing replacing is_object() for '!== null'.
2013-12-10 00:20:12 -03:00
Ber Clausen
63a192ea39
Update DboSource::group():
...
* Update documentation.
* Add Model type hint.
* Bail early when fields are empty.
2013-12-10 00:18:19 -03:00
Ber Clausen
5c595b90d2
Remove is_object() calls when the test subject is already type hinted as a Model.
2013-12-10 00:18:18 -03:00
Ber Clausen
2f24de81cb
Model objects should be in CamelCase.
...
Add a Model type hint.
2013-12-10 00:18:18 -03:00
Mark Story
19122414fc
Merge pull request #2459 from bar/2.5-patch
...
Test for self join only when needed.
2013-12-09 18:55:31 -08:00
Ber Clausen
b7527c6c3b
Test for a self join only when needed.
2013-12-09 23:11:42 -03:00
Ber Clausen
2366e7c7b5
Make getConstraint() a tiny bit more readable.
2013-12-09 22:25:03 -03: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
Jose Lorenzo Rodriguez
70d5c37834
Ensuring session is configured before trying to destory it
2013-12-08 13:44:16 +01: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
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
Rob Spencer
b8e32dd2b3
Adding flags override to additional pdo drivers
2013-11-24 01:04:17 -05:00
Rob Spencer
cda9320e96
Added support for passing additional flags to mysql connection
2013-11-24 00:47:06 -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
imsamurai
f817beb8b6
change method public unsigned
to protected _unsigned
2013-11-19 10:55:44 +02:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
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
1d9ecc6c94
Merge upstream/2.5 into 2.5
2013-11-17 21:13:25 +02:00
mark_story
b6b8d83980
Remove non-portable data type from MySQL.
...
'numeric' is a non-portable type that is not supported by any other
database driver. Removing it now will prevent future problems.
2013-11-14 10:28:09 -05:00
imsamurai
f1a2c1a75c
add decimal type for unsigned
2013-11-14 10:56:51 +02:00
imsamurai
7bc8dac453
fix phpcs errors
2013-11-14 02:19:41 +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
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
ed142d8c89
Add missing type hints.
2013-11-13 00:09:45 -03:00
Ber Clausen
0e74a0757a
Keep insertQueryData() DRY, issue less lookups. Remove unused $assocData
...
and $LinkModel from the signature.
Model objects should be CamelCase.
2013-11-13 00:09:39 -03:00