Commit graph

1481 commits

Author SHA1 Message Date
Philippe Gibert
98bc995623 fixes #11870 Add DboSource::expression support for Dbo VirtualFields 2018-03-23 17:19:41 +01:00
Mark Sch
b68f1cbb1f
Fix notice when passing false. 2018-03-14 17:07:08 +01:00
Wouter
1f0c973681
Don't break on removing a non-existing rule 2018-03-09 16:51:08 +01:00
Mark Sch
df9c7fd96e
Merge pull request #11616 from cakephp/issue-11186
Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
2018-02-05 14:48:22 +01:00
mark_story
5816143493 Fix usage of non-existant property.
Use the declared `_result` property instead. I would normally add
a test, but getting to this path requires a query to fail which is not
simple to simulate in the test harness.

Fixes #11615
2018-02-04 11:48:31 -05:00
Koji Tanaka
f4315d8ba4 When the PHP version is 7.2 or higher ini_set('session.save_handler', 'user') can't be executed, so delete. 2018-01-17 02:30:04 +09:00
mark_story
45695b6b5c Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
Refs #11186
2018-01-09 17:01:00 -05:00
chinpei215
6ad30946d8 Fix CS 2017-12-04 23:31:32 +09:00
dereuromark
eaf7454628 Clarify migration path to 3.x 2017-11-29 19:57:01 +01:00
chinpei215
4ae9f13dfd Fix 'order' not working with a single expressions 2017-11-29 00:17:57 +09:00
Mischa ter Smitten
d7b9e55e98 Fix indent 2017-11-23 14:12:13 +01:00
Mischa ter Smitten
05954ff405 Consistency changes 2017-11-23 10:09:25 +01:00
Mischa ter Smitten
4faac8e09a Improved readability 2017-11-23 10:06:14 +01:00
Mischa ter Smitten
bc1678cf2a Add option to make _validAgentAndTime 3.x compatible 2017-11-23 10:02:38 +01:00
Mark Story
d3a4ce1216 Merge pull request #11284 from kolorafa/patch-1
msSQL - also handle offset as string
2017-10-13 21:55:21 -04:00
Clemens Weiß
61eddc6bde Fixed formatting 2017-10-07 11:11:45 +02:00
Clemens Weiß
7f64ea37f9 Restored formatting 2017-10-06 17:11:09 +02:00
Clemens Weiß
5d5e791a31 Check for session.use_trans_sid and session ID in URL in case cookies are disabled (backport of cakephp/cakephp#10828 for 2.x) 2017-10-06 17:04:53 +02:00
kolorafa
22d2564de9 msSQL - also handle offset as string
When doing pagination you could get offset not as a int(eg. 10) but string(eg. "10") and it will not paginate at all.

For example DataTables plugin pass offset from params and all params from http request are strings wrapped in numbers.
Adding ctype_digit($offset) will also check the case.
2017-10-05 11:45:33 +02:00
LustyRain
0f00d73c70 Fix delete space, restored return 2017-10-04 21:02:48 +09:00
LustyRain
31b13edf8a Fix: phpdoc miss
## did
- void unReturn
- miss return void
- add return type
- type miss typing
- add param type and return type
  - string → string|array
- change ClassName
2017-10-04 00:22:42 +09:00
Mike Fellows
0b658697f2 Sqlserver DboSource does not allow the persistent option to be true.
This is backported from CakePHP 3.  The SQL Server PHP PDO driver does not
support the PDO::ATTR_PERSISTENT attribute.  So throw an exception if the
'persistent' option is set in the database config.  Also removes that
option from the Sqlserver base config.
2017-08-16 11:23:42 -07:00
Mark Story
cd6fba1361 Revert "Takes into account the current recursive value in deleteAll()." 2017-07-24 00:09:01 -04:00
mark_story
aa6770fa45 Merge branch '2.x' into 2.next 2017-07-22 14:59:41 -04:00
Val Bancer
d72c2d7e0e fixed code style, skipped pgsql and sqlite incompartible tests 2017-07-09 20:05:53 +02:00
Val Bancer
794ce22f37 fixed unit tests and docs 2017-07-09 19:24:51 +02:00
Val Bancer
f0bbcb3ffc fixed parsing of conditions with 'NOT' in TranslateBehavior 2017-07-08 16:51:32 +02:00
Val Bancer
3440615323 Refactroing in TranslateBehavior. Some code was moved to protected
methods, simplified the coditions.
2017-07-07 01:20:09 +02:00
mark_story
32f6b96060 Fix formatting. 2017-07-02 11:06:39 -04:00
Kurre Ståhlberg
4ec195f9c8 Fix error when default value is reported as CURRENT_TIMESTAMP() with parenthesis 2017-06-27 11:46:51 +03:00
mark_story
2032fef772 Merge branch '2.x' into 2.next 2017-06-26 21:51:41 -04:00
Mark Story
8cd930d19e Merge pull request #10764 from bancer/translate-inner-joins
Add left join support in TranslateBehavior
2017-06-26 21:40:42 -04:00
Val Bancer
5b37d42f97 joinType moved from $settings to $runtime 2017-06-26 23:02:06 +02:00
Val Bancer
0bfb19f126 left join support in TranslateBehavior 2017-06-12 21:41:35 +02:00
Marc Würth
da8414e13b Use HTTPS for the opensource.org MIT license URL 2017-06-11 00:23:22 +02:00
Marc Würth
04efc7ba50 Use HTTPS for the book.cakephp.org URL 2017-06-11 00:15:36 +02:00
Marc Würth
10b89b51a9 Use HTTPS for the cakefoundation.org URL 2017-06-11 00:10:59 +02:00
Marc Würth
17314baa15 Use HTTPS for the cakephp.org URL 2017-06-10 23:40:28 +02:00
Mischa ter Smitten
377aa2aa74 Drop short array syntax for PHP < 5.4 2017-06-08 20:31:34 +02:00
Mischa ter Smitten
ddbdf170e6 Fix discrepancy in Model::field when Model::id is null
When using ClassRegistry::init for instance
2017-06-08 20:22:29 +02:00
Val Bancer
2677cf4053 Takes into account the current recursive value in deleteAll(). 2017-06-07 23:38:12 +02:00
mark_story
cf679a3233 Merge branch '2.x' into 2.next 2017-05-27 21:47:22 -04:00
Joe
70ead28a1d Redo commits on 2.next branch 2017-05-12 02:02:36 -04:00
mark_story
0b6c23d04f Update schema reflection for postgres.
Use the schema reflection query from 3.x to provide access to the serial
column attributes. These attributes give a more reliable way to access
primary key data than comparing the primary key of the model. The old
approach failed when schema was generated and concrete model's were
missing.

Refs #10356
2017-03-26 22:23:41 -04:00
Sebastien Barre
e285df4f82 optimization, break early 2017-03-25 09:30:34 -04:00
mark_story
b6372d63d9 Rename (small|tiny)int to (small|tiny)integer
Make the new types consistent with the biginteger.
2017-03-11 21:41:22 -05:00
Sebastien Barre
d78829bd93 coding/doc standard, move @link after @var, per req 2017-03-09 10:54:17 -05:00
Sebastien Barre
4fc8f7d919 fix test for UnsignedFixture 2017-03-06 00:21:11 -05:00
Sebastien Barre
3849df0f2f fix duplicate primary keys for tables without models 2017-03-05 21:47:00 -05:00
Sebastien Barre
7c0bcb16c8 add missing MySQL data type link 2017-03-05 12:28:41 -05:00
Sebastien Barre
38101995b4 introduce new tinyint, smallint types for smaller storage requirements 2017-03-05 12:25:14 -05:00
Sebastien Barre
d01f3e8aed allow data sources to provide smaller integers based on storage requirements 2017-03-04 00:08:27 -05:00
chinpei215
c5ad005475 Add return description 2017-03-02 20:34:28 +09:00
chinpei215
923b73a7ba Add support for having/lock options 2017-02-03 17:51:22 +09:00
Cory Thompson
55324c0b2a Allow SQL json selects without defining table name 2017-01-24 20:54:07 +11:00
Cory Thompson
990d0a962f Allow database JSON operations in conditions 2017-01-24 19:33:12 +11:00
Cory Thompson
82a64a3729 Merge remote-tracking branch 'doublemap/exclude-column-trailing-hyphen' into ticket-8872 2017-01-24 19:25:24 +11:00
mark_story
1a8f2202c0 Merge branch '2.x' into 2.next 2017-01-03 11:01:04 -05:00
mark_story
e01f5989af Use array conditions for joins.
Use array style conditions instead of using lower-level DboSource API
methods to create safe SQL.

Refs #9927
2016-12-28 23:18:30 -05:00
mark_story
837741db66 Merge branch '2.x' into 2.next 2016-12-13 22:48:44 -05:00
chinpei215
21502db34a Fix TreeBehavior does access property/method via model 2016-12-13 07:15:48 +09:00
mark_story
e057b5572c Fix PHPCS. 2016-11-21 20:51:12 -05:00
mark_story
71b7d6211b Fix AclNode constructor.
It should forward the settings from ClassRegistry::init() so that
aliases can be customized as needed.

Refs #9766
2016-11-19 22:30:18 -04:00
Mischa ter Smitten
e71afa225e Merge remote-tracking branch 'upstream/2.x' into make-it-possible-to-configure-cachemethodhashalgo-in-dbosource 2016-11-14 16:26:48 +01:00
Mischa ter Smitten
1952d2ee17 Add tests for cacheMethodFilter 2016-11-14 11:44:35 +01:00
Mischa ter Smitten
71535d2d2c Change cacheMethodFilters to be a method 2016-11-14 11:15:08 +01:00
Mischa ter Smitten
e186ffc6d3 Change cacheMethodHashAlgo to be a method 2016-11-14 09:42:19 +01:00
Mischa ter Smitten
15ccf057f4 Make it possible to configure cacheMethodHashAlgo in DboSource 2016-11-12 00:18:13 +01:00
Mischa ter Smitten
58cc9b4596 Make it possible to filter values per method in DboSource::cacheMethod 2016-11-11 23:37:23 +01:00
mark_story
135a24e0f1 Merge branch '2.x' into 2.next 2016-10-28 00:29:46 -04:00
mark_story
816801902e Allow '' to be a valid key for Hash, and Session
By removing a bunch of empty() guards we can make '' behave like all the
other key names. This does change the existing behavior/tests around ''
key, but I think that is ok given the need to manipulate ''.

Refs #9632
2016-10-21 10:54:39 -04:00
mark_story
ecd270d04b Tweak/Add doc blocks. 2016-10-09 11:05:35 -04:00
David Maicher
a932bce3de [Bugfix] use Model::$cacheQueries as default for ->query(...) 2016-10-09 13:43:27 +02:00
José Lorenzo Rodríguez
9425234b87 Merge pull request #9550 from cakephp/issue-9526
Fix enum column length detection.
2016-10-06 09:29:25 +02:00
mark_story
9c3b17cbc7 Fix failing test in postgres. 2016-10-05 22:28:51 -04:00
mark_story
689d516a99 Fix typo. 2016-10-04 21:38:26 -04:00
mark_story
3a185f9713 Remove incorrrect postgres implementation.
It was wrong, and no longer really needs to exist as the parent method
covers all the scenarios that were previously required other than the
uuid one.
2016-10-02 22:59:13 -04:00
mark_story
3587ac9976 Fix PHPCS error. 2016-10-02 19:06:10 -04:00
Andrej Griniuk
2d6e85ed14 validate table name before generating schema file 2016-10-03 00:23:05 +08:00
mark_story
e41ccdb701 Fix enum column length detection.
Use simpler code to calculate the length of fields. Include more tests
for DboSource as there weren't any before.

Refs #9526
2016-09-30 22:25:25 -04:00
Rozehnal, Pavel
34fa24f225
Avoiding extract in CakeSchema class
due bad readability and avoiding parsing error in IDEs - no functional changes
2016-09-19 14:10:02 +02:00
mark_story
ad5130cd31 Merge branch '2.next' into 2.x 2016-09-18 22:22:56 -04:00
mark_story
835c709dfd Add code fencing on example. 2016-09-16 19:17:08 -04:00
Marc Würth
1b101f73a6 Minor DocBlock improvement 2016-09-16 13:02:55 +02:00
Val Bancer
427d928d10 minor code style improvements 2016-09-05 21:53:10 +02:00
Val Bancer
98cd278c02 improved performance of insertMulti() in Mysql 2016-09-05 21:28:07 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
Mark van Driel
4dc8e54131 Fixed typo 2016-07-27 20:27:15 +02:00
Mark van Driel
5caac5f340 Prevent unnecessary joins / complex conditions in delete 2016-07-27 16:31:57 +02:00
Andrej Griniuk
e7f3365d8b fix on php < 5.5 2016-07-26 23:57:14 +03:00
Andrej Griniuk
147693618c refs #9174 fix CakeSchema compare when changing field length to the default one 2016-07-26 23:39:09 +03:00
Mark van Driel
c01525f2cc Make check more strict to respect existing queries 2016-07-26 11:25:27 +02:00
Mark van Driel
d6e45131ad Prevent unnecessary joins / complex conditions in delete 2016-07-25 17:15:18 +02:00
Philippe Saint-Just
be7cecbb00 Removed whitespace 2016-07-10 14:02:55 +01:00
Philippe Saint-Just
7edcdb0799 Handle plugin association consistently 2016-07-09 16:08:16 +01:00
mark_story
432eb9c432 Merge branch '2.x' into 2.next 2016-06-27 21:47:47 -04:00
mark_story
92a50d05dc Reset query timing metrics for begin/commit/insert multi calls.
Apply patch from @Mensler to reset the query metrics for transaction
operations, and for each iteration of an insertMulti call. This helps
provide more accurate query times.

Refs #9014
2016-06-22 22:20:00 -04:00
Eric Jiang
9f9ae8a9fd Ignore final hyphen in column name when requoting
An expression like "Foo"."bar"->'prop' should not be re-quoted as
"Foo"."bar-">'prop'. Bare columns cannot include hyphens in most DBs
anyways.
2016-05-19 01:56:20 -07:00
Markus Bauer
2227e01990 Fixing Sqlite's handling of datetime/timestamp columns with current_timestamp default set 2016-05-19 00:21:43 +02:00
mark_story
12c6fd4e22 Merge branch '2.x' into 2.next 2016-05-02 21:58:41 -04:00