Daniel Hensby
cc0320b2a7
Merge branch '4.2' into 4
2018-07-23 17:42:43 +01:00
Daniel Hensby
b984959170
Merge branch '4.1' into 4.2
2018-07-23 13:30:49 +01:00
Daniel Hensby
1a634f5ba6
Merge pull request #8244 from altwohill/column-not-distinct
...
Make column query not distinct
2018-07-16 13:01:32 +01:00
Al Twohill
3292a8b773
NEW Add columnUnique API SS_List classes.
2018-07-16 12:16:17 +01:00
Al Twohill
91068c23b5
FIX Make column query not distinct
...
When selecting a column, it doesn't make sense to have it distinct.
As an alternative, the API could be changed to give the end user the option
(eg `->column($field, $distinct = false)`)
However if we did that, we would need to make sure we do something
similar with `SilverStripe\ORM\UnsavedRelationList` to ensure consistency.
2018-07-16 11:38:41 +01:00
Robbie Averill
d122995652
FIX Duplicate config values for cascade_duplicates no longer duplicate their duplicates
...
Previously you could define identical values for this config prop via a DataExtension and on the base
class, resulting in double duplication
2018-07-16 12:04:56 +12:00
Harsh Chokshi
6af736a9e1
Change DBCurrency scaffolded form field to CurrencyField ( fixes #8246 )
...
Add test ensuring DBCurrency scaffolds CurrencyField
2018-07-09 10:57:01 +12:00
Luke Edwards
fbf30ee747
Message reflect previous return type change
2018-07-04 10:55:20 +12:00
Luke Edwards
9ee84fd515
MINOR: DataObject->fieldLabels() will only return an array
2018-07-02 13:53:59 +12:00
Robbie Averill
a39a221c4c
Merge branch '4.2' into 4
2018-06-25 13:45:03 +12:00
Daniel Hensby
27b60ae989
FIX Transaction depth should error if not implemented by child classes
2018-06-21 14:26:21 +01:00
Robbie Averill
df257686c1
Restore check for zero or negative transaction nesting
2018-06-20 14:46:50 +12:00
Daniel Hensby
d8430f549d
Address feedback
2018-06-20 14:46:50 +12:00
Damian Mooyman
6da72d686f
Maybe fix it?
2018-06-20 14:46:50 +12:00
Damian Mooyman
a116b5dad8
BUG FIx manual resetDBSchema() calls breaking the database
2018-06-20 14:46:50 +12:00
Damian Mooyman
fbfd454d65
ENHANCEMENT Ensure test DB is flushed on either DDL or transaction-disabled tests
...
Fixes #8182
2018-06-20 14:46:50 +12:00
Daniel Hensby
a7a45559f0
Merge pull request #8188 from gelysis/array-lib
...
Tweaks on the ArrayLib class
2018-06-19 15:06:39 +01:00
Aaron Carlino
05edb372f1
Revise per tractorcow review
2018-06-18 16:00:17 +12:00
jovenden
b0863fee91
Ensure tables are properly named on dontRequireTable()
2018-06-18 16:00:17 +12:00
Andreas Gerhards
59fe36ba04
Tweaked the other flattening method as well, allowing keys to be preserved
2018-06-18 11:16:20 +12:00
Andreas Gerhards
1753bb2d07
Improved speed on the recursive array flattening
2018-06-18 10:37:20 +12:00
Andreas Gerhards
f45cf75407
Implemented improved associative array check
2018-06-18 08:45:22 +12:00
Damian Mooyman
53dded8cff
API Remove @internal from new 4.2 methods
2018-06-15 13:14:42 +12:00
Robbie Averill
5fa5abf295
Merge branch '4.1' into 4
...
# Conflicts:
# src/Forms/DateField.php
2018-06-15 11:52:07 +12:00
Damian Mooyman
b636587945
Respect semver and add tests
2018-06-15 11:04:12 +12:00
Damian Mooyman
310a259c5f
Add locale to Format
...
Fix up some regressions
2018-06-14 17:28:16 +12:00
Damian Mooyman
3ce8ab3adc
Improve handling of deprecated apis
2018-06-14 13:01:27 +12:00
Damian Mooyman
687d0a6af1
Refactor everything out of HTTP and into separate middlewares
2018-06-13 17:56:47 +12:00
Damian Mooyman
02ae2e7ed0
BUG Fix internal date formatting inheriting default locale
...
Fixes #8097
2018-06-13 13:32:11 +12:00
Daniel Hensby
ec956a682d
API Moving tests to use transactions
2018-06-13 09:35:45 +12:00
Damian Mooyman
77a45c0dbc
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# src/Forms/HTMLEditor/HTMLEditorSanitiser.php
# src/ORM/DataObjectSchema.php
# src/ORM/Queries/SQLSelect.php
# src/View/Parsers/ShortcodeParser.php
2018-06-11 10:19:04 +12:00
Robbie Averill
d842225df6
FIX Codesniffer style violations with comments
2018-06-11 09:55:18 +12:00
Daniel Hensby
e260319823
Merge branch '4.0' into 4.1
2018-06-08 23:05:24 +01:00
Daniel Hensby
e1450b5e82
Merge pull request #8147 from kinglozzer/mysql-pdo-attr
...
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103 )
2018-06-08 13:06:03 +01:00
Damian Mooyman
29f9b1c18f
Fix linting issues
2018-06-08 11:38:36 +12:00
Loz Calver
66f57bd4da
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver ( fixes #8103 )
2018-06-07 10:26:00 +01:00
Damian Mooyman
0aa13da0d9
BUG Backport bugfix for belongs_many_many with many_many through.
...
Partial backport of #7928
Fixes #8131
2018-06-06 09:43:04 +12:00
Damian Mooyman
2510935b53
Merge pull request #8065 from dhensby/pulls/4/mmtl-jointable
...
NEW Add getJoinTable to MMTL
2018-06-01 10:33:46 +12:00
Robbie Averill
e0993043f8
Merge branch '4.1' into 4
2018-05-30 15:08:39 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
ea16e28aa7
Merge branch '4.1' into 4
2018-05-28 18:33:56 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Daniel Hensby
1a57c7c1d0
NEW Add getJoinTable to MMTL
2018-05-14 11:19:24 +01:00
Robbie Averill
cd716fb61b
Switch check for is_string
2018-05-14 17:05:31 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
JorisDebonnet
1d3e83838d
Fix phpdoc for relation method (namespace)
2018-04-30 02:10:33 +02:00
UndefinedOffset
d17f424541
Changed checked for UnsavedRelationList to ManyManyList
2018-04-18 12:15:16 -03:00
