aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2020-03-02 14:20:09 -0800
committerKrinkle <krinklemail@gmail.com>2020-03-10 22:26:04 +0000
commit13b11a946ea4c5f98d607c0f974313ac98d039d2 (patch)
treed7aaf6dd09e1c2717d2cfaa1b52942cc769ce9c2 /tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
parent0da37edd0baf309b5eb4ae379580098c2e81a552 (diff)
downloadmediawikicore-13b11a946ea4c5f98d607c0f974313ac98d039d2.tar.gz
mediawikicore-13b11a946ea4c5f98d607c0f974313ac98d039d2.zip
rdbms: reduce duplication in Database via helper methods
Add several new internal methods to help with wrangling the various formats that rows, conditions, options, and unique key lists can come in. Remove now unused method isMultiRowArray(). Add various sanity checks and logging for parameters to upsert(), replace(), insert(), and insertSelect(). Move DatabasePostgresTest to the integration/ directory. Change-Id: If5988a6f0816e8da2cbf2fd612e1a3e3a2e9c52f
Diffstat (limited to 'tests/phpunit/integration/includes/db/DatabaseSqliteTest.php')
-rw-r--r--tests/phpunit/integration/includes/db/DatabaseSqliteTest.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php b/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
index b7f2c11a93b6..d23b121abaa7 100644
--- a/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
@@ -591,13 +591,13 @@ class DatabaseSqliteTest extends \MediaWikiIntegrationTestCase {
'3.7.11',
'a',
[ 'a_1' => 1 ],
- 'INSERT INTO a (a_1) VALUES (1);'
+ 'INSERT INTO a (a_1) VALUES (1);'
],
[
'3.7.10',
'a',
[ 'a_1' => 1 ],
- 'INSERT INTO a (a_1) VALUES (1);'
+ 'INSERT INTO a (a_1) VALUES (1);'
],
[
'3.7.11',
@@ -606,7 +606,7 @@ class DatabaseSqliteTest extends \MediaWikiIntegrationTestCase {
[ 'a_1' => 2 ],
[ 'a_1' => 3 ]
],
- 'INSERT INTO a (a_1) VALUES (2),(3);'
+ 'INSERT INTO a (a_1) VALUES (2),(3);'
],
[
'3.7.10',
@@ -616,8 +616,8 @@ class DatabaseSqliteTest extends \MediaWikiIntegrationTestCase {
[ 'a_1' => 3 ]
],
'BEGIN;' .
- 'INSERT INTO a (a_1) VALUES (2);' .
- 'INSERT INTO a (a_1) VALUES (3);' .
+ 'INSERT INTO a (a_1) VALUES (2);' .
+ 'INSERT INTO a (a_1) VALUES (3);' .
'COMMIT;'
]
];