Commit Graph

286 Commits

Author SHA1 Message Date
Sam Minnee
8f70ac89ca FIX: Removed test that has been moved back to framework
This test has been added for all database types in framework
in https://github.com/silverstripe/silverstripe-framework/pull/8448
2018-11-05 18:13:47 +13:00
Sam Minnee
72787ae83e FIX: Return correct types in PostgreSQLQuery
Fixes https://github.com/silverstripe/silverstripe-postgresql/issues/90
Helps fix https://github.com/silverstripe/silverstripe-framework/issues/7039
2018-11-05 18:13:47 +13:00
Robbie Averill
4c6034f350 Bump branch alias for 2.2.x-dev 2018-09-24 12:49:53 +02:00
Robbie Averill
edfa209a3c Merge branch '2.1' into 2 2018-09-24 12:49:36 +02:00
Robbie Averill
e123f69b7b Remove obsolete branch alias 2018-09-24 12:48:49 +02:00
Daniel Hensby
4c89d103c5
Merge branch '1' into 2 2018-07-13 17:42:10 +01:00
Maxime Rainville
6378003540 Prefer source so we get the tests. 2018-07-02 11:47:15 +12:00
Maxime Rainville
b210c7284f Targeting 4.3.x-dev
Third time's a charm.
2018-07-02 11:47:15 +12:00
Maxime Rainville
7fe935fc89 Correct typo in targeted version. 2018-07-02 11:47:15 +12:00
Maxime Rainville
694c4059b9 Test against recipe-cms 4. 2018-07-02 11:47:15 +12:00
Robbie Averill
6cfc30952c
Merge pull request #86 from open-sausages/pulls/2/report-transaction-nesting
API Support better transaction nesting
2018-06-19 16:57:46 +12:00
Damian Mooyman
e0d5536715
API Support better transaction nesting 2018-06-19 16:20:07 +12:00
Damian Mooyman
01cc78ec94
Merge pull request #85 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:12:41 +12:00
Dylan Wagstaff
513c969c93 Add supported module badge to readme 2018-06-15 17:43:43 +12:00
Damian Mooyman
e3825697d0
Merge remote-tracking branch 'origin/2.0' into 2 2018-02-09 10:05:32 +13:00
Daniel Hensby
47a6ebb4e3 FIX Allow nested transactions 2018-02-09 10:05:00 +13:00
Damian Mooyman
2bbd73620d
Merge pull request #83 from dhensby/pulls/2.0/nested-transactions
FIX Allow nested transactions
2018-02-09 09:50:46 +13:00
Daniel Hensby
97afbd9a88
FIX Allow nested transactions 2018-02-08 20:00:49 +00:00
Damian Mooyman
f2392eb7c6
Merge remote-tracking branch 'origin/2.0' into 2 2017-12-07 16:31:21 +13:00
Damian Mooyman
1f6d892609
Merge remote-tracking branch 'origin/1.2' into 2.0
# Conflicts:
#	code/PostgreSQLDatabase.php
2017-12-07 16:30:22 +13:00
Damian Mooyman
2d11336dce
Merge remote-tracking branch 'origin/1.2' into 1 2017-12-07 16:26:06 +13:00
Damian Mooyman
aa16771922
Merge pull request #1 from silverstripe-security/patch/1.2/SS-2017-008
[SS-2017-008] Fix SQL injection in search engine
2017-12-07 15:59:04 +13:00
Damian Mooyman
05e15d85d6
Merge branch '2.0' into 2 2017-11-28 10:37:16 +13:00
Damian Mooyman
a401f7ad24
Remove alias from 2.0 branch 2017-11-28 10:36:18 +13:00
Loz Calver
390cb09928
FIX: Add missing $totalCount variable 2017-11-25 21:40:01 +00:00
Daniel Hensby
d110b92fc8
Merge pull request #80 from kinglozzer/fix-searchengine
Fix PostgreSQLDatabase::searchEngine()
2017-11-25 18:09:58 +00:00
Loz Calver
851309f187 Fix PostgreSQLDatabase::searchEngine() 2017-11-24 22:28:01 +00:00
Daniel Hensby
ee356b1ad7
[SS-2017-008] Fix SQL injection in search engine 2017-11-21 15:34:59 +00:00
Daniel Hensby
a32f5e556a
Correcting travis install steps 2017-11-21 11:38:00 +00:00
Damian Mooyman
1277361a6c
Remove version constraint 2017-11-21 18:32:56 +13:00
Chris Joe
e41df60b40
Merge pull request #78 from open-sausages/pulls/4.0/update-4.0-stable
BUG Fix 4.0.0 compat / PDO not working
2017-11-20 11:14:34 +13:00
Damian Mooyman
685e33cf84
BUG Fix postgres + PDO not working
BUG Fix empty enums
2017-11-20 09:07:32 +13:00
Damian Mooyman
8c5f95fdaa Merge pull request #77 from Rudigern/insert-concurrency-issue
getGeneratedID to use currval() which is session dependent
2017-10-20 18:47:01 +13:00
Neil Gladwin
7a8bcd1ec5 Returns the last inserted ID using currval() which is session dependant rather than last_value which is across all sessions 2017-10-20 13:38:06 +10:00
Damian Mooyman
ff64974e45 Merge pull request #76 from open-sausages/pulls/2/vendorise-me-baby
Expose as vendor module
2017-10-03 16:16:18 +13:00
Ingo Schommer
49105eb19b Expose as vendor module 2017-10-03 03:05:20 +13:00
Loz Calver
4a1968df94 Merge pull request #75 from dhensby/pulls/yml-syntax
FIX Quote yample starting with %
2017-07-27 11:04:57 +01:00
Daniel Hensby
0c2b48421b
FIX Quote yample starting with % 2017-07-27 10:41:34 +01:00
Daniel Hensby
d7118b6267
Merge branch '1' 2017-07-26 16:33:23 +01:00
Daniel Hensby
0b5b6ddad2
Merge branch '1.2' into 1 2017-07-26 14:23:29 +01:00
Daniel Hensby
e3bebfe453
Merge branch '1.1' into 1.2 2017-07-26 14:23:02 +01:00
Daniel Hensby
5187e747b3
Actually run tests using postgres 2017-07-26 14:22:00 +01:00
Daniel Hensby
e6dbc0a708
Merge branch '1' 2017-07-26 13:57:30 +01:00
Daniel Hensby
5dd9b83b57
Merge branch '1.2' into 1 2017-07-26 13:53:47 +01:00
Daniel Hensby
1c953025e6
Merge branch '1.1' into 1.2 2017-07-26 12:15:02 +01:00
Daniel Hensby
6a168488ac
Stay on travis precise 2017-07-26 11:55:24 +01:00
Daniel Hensby
1a78f20b8a
Merge branch '1.0' into 1.1 2017-07-26 11:52:50 +01:00
Daniel Hensby
4b3fd28b3b
Backport of #48 2017-07-26 11:48:27 +01:00
Daniel Hensby
45a57a80f0 Update composer constraint 2017-07-26 11:39:17 +01:00
Damian Mooyman
c3dbb76ef6 Merge pull request #65 from phptek/issue/64
FIX: Fixes #64 by the addition on of the USING clause.
2017-07-26 16:35:38 +12:00