AD7six
c0ee49fe88
Remove callbacks to speed up saving
2015-01-23 08:30:26 +00:00
AD7six
838d23300b
Remove some exists checks by not validating
2015-01-23 08:29:59 +00:00
AD7six
51bd1d0a2b
If a PDOException is thrown, try again.
...
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
2015-01-23 08:28:08 +00:00
mark_story
511ee1f776
Fix strict error with 2.6 code.
2015-01-19 21:43:14 -05:00
mark_story
3078a1eb52
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-01-16 22:22:26 -05:00
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
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
antograssiot
c2f298a8b7
Replace our custom code fence with markdown standard fence
2015-01-09 13:47:25 +01:00
Mark Story
c4f9727720
Merge pull request #5576 from istvanp/2.7
...
Prevent NULL value on NOT NULL column when value is an empty string
2015-01-06 21:23:53 -05:00
Istvan Pusztai
22b0275a58
Prevent NULL value on NOT NULL column when value is an empty string (MySQL)
2015-01-05 12:04:24 -05:00
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
euromark
394da88d23
Stay 100% BC for 2.7
2015-01-04 10:52:18 +01:00
euromark
39e0ce415d
Backport of 3.0 Session API hardening and clear().
2015-01-04 01:40:09 +01:00
mark_story
4cd2c8fdcb
Merge branch 'master' into 2.7
2015-01-03 14:34:55 -05: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
7bbc3dfd90
Merge pull request #5470 from cakephp/2.7-session
...
Backport Session consume() to 2.x
2014-12-26 12:22:20 -05:00
euromark
813925abee
Backport Session consume()
2014-12-23 03:39:05 +01:00
mark_story
c540e2b798
Merge branch 'master' into 2.6
2014-12-22 21:38:58 -05:00
Mark Story
484b114e9b
Merge pull request #5384 from okinaka/fix-mysql-describe
...
2.5: Fixing Mysql::describe() for timestamp.
2014-12-21 21:27:27 -05:00
Rachman Chavik
45be270a7b
Enable use of Containable with TreeBehaviors
...
This patch allows Containable use with:
- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
2014-12-20 16:32:20 +07: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
mark_story
cf108dbff3
Remove duplicate order key.
...
This was a mistake made in 4b6dba0
.
Fixes #5376
2014-12-10 22:32:59 -05: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
ad2d6edda9
Merge branch 'master' into 2.6
2014-12-06 21:28:59 -05:00
Guy Warner
327fcb4846
Fix some missed doc block issues
2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b
Add @trigger doc blocks of methods triggering CakeEvent
2014-11-30 14:45:40 -07: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
Mark Story
f570f931ce
Merge pull request #5159 from cakephp/issue-5155
...
Add order=>false to all treebehavior queries.
Refs #5155
2014-11-14 10:02:17 -05:00
mark_story
4b6dba0c0a
Add order=>false to all treebehavior queries.
...
Models can define default order conditions that will cause issues with
postgres. By setting order=>false on all the queries emitted by
TreeBehavior, we can avoid this issue and not have issues with models
that define a default ordering.
Refs #5155
2014-11-13 21:21:47 -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
watermark
8712dc01df
Cleanup of isUnique
...
isUnique takes the count of the args multiple times. Store the count in a variable to cut down on overhead.
2014-11-11 16:13:16 -05:00
Mark Story
4242ce453f
Merge pull request #5093 from cakephp/2.6-returns
...
Simplify return types.
Update code to use documented return types where possible, and reduce number of return types.
2014-11-08 14:58:22 -05:00
euromark
41c646c5a1
Simplification of return types. No need to return more mixed than necessary.
2014-11-08 20:07:47 +01:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
mark_story
dac8b7b644
Update return type for Model::saveField().
...
Fixes #5086
2014-11-05 20:37:43 -05:00
euromark
345a18f15f
Merge branch 'master' into 2.6
2014-11-05 23:29:06 +01:00
euromark
0d5d6b19b5
Wording correction.
2014-11-05 13:14:45 +01:00