Mark Story
2a9f2d4b58
Merge pull request #5668 from cakephp/issue-5649
...
Fix numeric values not being quoted for MySQL set columns.
2015-01-15 21:29:57 -05:00
mark_story
d4a6d3f6c0
Fix numeric values not being quoted for MySQL set columns.
...
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.
Refs #5649
2015-01-15 21:10:33 -05:00
David Steinsland
687d0b44f5
Backport of https://github.com/cakephp/cakephp/issues/5667
2015-01-15 11:00:27 +01:00
Mark Story
0a4cffc603
Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir
...
Also autocreate session folder in debug mode
2015-01-02 11:36:53 -05:00
mark_story
ec57fb4579
Fix length reflection in SQLServer
...
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.
Refs #5506
2014-12-29 16:47:50 -05:00
euromark
5aff618109
Also autocreate session folder in debug mode
2014-12-27 20:34:47 +01:00
mark_story
c540e2b798
Merge branch 'master' into 2.6
2014-12-22 21:38:58 -05:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
OKINAKA Kenshin
8c008ad97d
Update.
2014-12-11 13:55:41 +09:00
OKINAKA Kenshin
5cff6aa746
Fixing Mysql::describe() for timestamp.
2014-12-11 10:31:19 +09:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
mark_story
543f05e3d0
Merge branch 'master' into 2.6
2014-11-29 22:00:00 -05:00
euromark
d0f75a03af
Allow RLIKE in conditions.
2014-11-26 19:56:58 +01:00
Stephen Cuppett
ffb7e86641
Enable sslmode for PostgreSQL connections
...
By default, PHP 5.5 and PostgreSQL PDO will not allow SSL connections. This adds the default of "allow", but also the user may override the setting to "require" or any of the other potential values.
See: http://php.net/manual/en/function.pg-connect.php
2014-11-20 22:37:39 -05:00
mark_story
23c5805763
Fix mistake with previous commit.
...
I forgot to put the correct variable into the query like a doofus.
Refs #4168
2014-11-18 22:03:30 -05:00
mark_story
ddc3eee84c
Use name() instead of hand quoting sequence names.
...
By using name() we can easily accomodate postgres sequences that exist
out side of sequences.
Fixes #4168
2014-11-17 22:47:07 -05:00
mark_story
decce4daf2
Merge branch 'master' into 2.6
2014-11-14 21:25:09 -05:00
Bryan Crowe
e3e54d40fa
Fix CS, remove extra space
2014-11-13 16:47:10 -05:00
mark_story
6092c168a9
Fix issues with sqlite field parsing.
...
The previous attempt would still fail on unions or derived table join
queries. This new approach is a bit slower but more robust.
Refs #3972
2014-11-12 20:49:19 -05:00
mark_story
93a6fd5648
Fix SQLite parsing fields incorrectly when using subqueries.
...
When using subqueries or joining against tables containing FROM the
results were bizzare and unexpected. By tokenizing the entire query we
can more accurately grab the fields.
Refs #3972
2014-11-11 23:16:08 -05:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
euromark
0d5d6b19b5
Wording correction.
2014-11-05 13:14:45 +01:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
mark_story
48101e6bf5
Merge branch 'master' into 2.6
2014-11-04 22:44:11 -05:00
Mark Story
96b82e4226
Merge pull request #5021 from dereuromark/master-mysql
...
Fix IN replacement in virtual fields for MYSQL.
2014-11-04 08:24:03 -05:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
Mark Story
a8c5b70b22
Merge pull request #4489 from busgurlu/patch-1
...
to correctly return SET() type
2014-10-30 19:56:47 -04:00
euromark
e5b45bcdea
Fix IN replacement in virtual fields for MYSQL.
2014-10-30 19:14:04 +01:00
Marc Würth
84b0fe1c88
Added comment to $tableParameters array
2014-10-16 16:06:33 +02:00
mark_story
87fcc9f0b9
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-13 21:11:38 -04:00
ADmad
ecf030796b
Fix docblock
2014-10-11 19:37:22 +05:30
ADmad
94e718372a
Make CakeSession::read() return null for all failure cases.
2014-10-09 19:27:27 +05:30
mark_story
af43bc1706
Merge branch 'master' into 2.6
2014-09-25 22:39:51 -04:00
mark_story
1877cab341
Fix UUID primary key columns not being reflected properly.
...
When UUID columns are converted into varchar(36) they should also be
default = null, null = false.
Fixes #4695
2014-09-23 22:16:18 -04:00
mark_story
0d11cf7a33
Merge branch 'master' into 2.6
2014-09-14 23:26:33 -04:00
mark_story
9e4446fe5f
Trim whitespace from columns before checking for operators.
...
Fixes #4599
2014-09-13 21:50:35 -04:00
ADmad
3fb252ad2f
Merge branch 'master' into 2.6
2014-09-13 00:37:16 +05:30
euromark
e3dc51bb68
Manually correct remaining casts.
2014-09-10 16:40:22 +02:00
euromark
04ef39217f
Take care of more int casts.
2014-09-10 16:29:23 +02:00
euromark
e77f96d8b7
Use (int) cast instead of intval() function for performance reasons and to unify it.
2014-09-10 15:52:57 +02:00
mark_story
734bb9223b
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
Burak USGURLU
996ad04b95
to correctly return SET() type
2014-09-04 18:07:30 +03:00
José Lorenzo Rodríguez
b5bfbfcf15
Merge pull request #4223 from chinpei215/2.6-issue2529-fix
...
Fix different format of $results in afterFind
2014-09-03 10:39:37 +02:00
mark_story
638d2ea7b6
Add array cast for method_cache data.
...
Fixes #4186
2014-09-02 22:39:28 -04:00
ADmad
d60cd3ab2f
Revert "Merge pull request #4405 from php-engineer/master-session-bugfix"
...
This reverts commit 5863adda42
, reversing
changes made to 4c37cf6d4b
.
There was no real issue. The lack of session cookie in CLI makes writing
tests a bit tricky which caused the confusion. Refs #4405 , #4451 .
2014-09-01 00:17:53 +05:30
mark_story
7c316bbc56
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/basics.php
2014-08-30 21:28:11 -04:00
chinpei215
31204832c2
Ensure that afterFind is called when using 'joins' with 'recursive' = -1
2014-08-27 15:16:13 +09:00
chinpei215
b74774bb0c
hasOne/belongsTo associations should contain associated records in afterFind
...
Before 1fe943d6f1
,
afterFind() is called twice with belongsTo/hasOne associations.
Although $results also doesn't contain associated records on first time,
it contains them on second time.
After 1fe943d6f1
,
it doesn't work if associated records are used in afterFind.
This commit fixes it.
2014-08-27 09:32:00 +09:00
Stefan Dickmann
66ccfaf5e2
session bugfix
2014-08-26 17:47:45 +02:00
mark_story
7936b5e764
Fix CURRENT_TIMESTAMP being stored as a default value.
...
When reflecting timestamp columns in MySQL current_timestamp comes back
as the default value. This causes insertion errors later on as
'current_timestamp' is an invalid value for timestamp columns.
Refs #4184
2014-08-25 11:17:11 +02:00