jenkins-bot has submitted this change and it was merged.
Change subject: Ensure UTF-8 in the round-trip testing server database tables
and connection.
......................................................................
Ensure UTF-8 in the round-trip testing server database tables and connection.
Change-Id: I500952c9b444dea774ee0f12a0137f898dd30c45
---
M js/tests/server/importJson.js
M js/tests/server/server.js
M js/tests/server/sql/create_everything.mysql
3 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/server/importJson.js b/js/tests/server/importJson.js
index a4cbc51..f76e4df 100755
--- a/js/tests/server/importJson.js
+++ b/js/tests/server/importJson.js
@@ -83,6 +83,7 @@
database : getOption( 'database' ),
user : getOption( 'user' ),
password : getOption( 'password' ),
+ charset : 'UTF8_BIN',
multipleStatements : true
});
diff --git a/js/tests/server/server.js b/js/tests/server/server.js
index a27aaad..c667b99 100755
--- a/js/tests/server/server.js
+++ b/js/tests/server/server.js
@@ -119,6 +119,7 @@
user : getOption( 'user' ),
password : getOption( 'password'),
multipleStatements : true,
+ charset : 'UTF8_BIN',
debug : debug
} );
diff --git a/js/tests/server/sql/create_everything.mysql
b/js/tests/server/sql/create_everything.mysql
index fca9f28..93e64b1 100644
--- a/js/tests/server/sql/create_everything.mysql
+++ b/js/tests/server/sql/create_everything.mysql
@@ -3,7 +3,7 @@
CREATE TABLE commits (
hash CHAR( 40 ) NOT NULL PRIMARY KEY,
`timestamp` TIMESTAMP NOT NULL
-);
+) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
CREATE TABLE pages (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -16,7 +16,7 @@
claim_hash CHAR( 40 ) NOT NULL DEFAULT '',
claim_timestamp TIMESTAMP NULL,
claim_num_tries INTEGER NOT NULL DEFAULT 0
-);
+) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
CREATE INDEX title_idx ON pages ( title ( 50 ) );
CREATE INDEX latest_tries_score_idx ON pages ( claim_num_tries, latest_score );
CREATE UNIQUE INDEX title_prefix_idx ON pages ( title ( 50 ), prefix );
@@ -26,7 +26,7 @@
page_id INTEGER NOT NULL,
commit_hash CHAR( 40 ) NOT NULL,
result TEXT NOT NULL
-);
+) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
CREATE UNIQUE INDEX results_page_commit_idx ON results ( page_id, commit_hash
);
CREATE TABLE stats (
@@ -37,7 +37,7 @@
fails INTEGER NOT NULL DEFAULT 0,
errors INTEGER NOT NULL DEFAULT 0,
score INTEGER NOT NULL DEFAULT 0
-);
+) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
CREATE UNIQUE INDEX stats_page_commit_idx ON stats ( page_id, commit_hash );
CREATE TABLE perfstats (
@@ -46,4 +46,4 @@
type CHAR( 30 ) NOT NULL,
PRIMARY KEY( page_id, commit_hash, type ),
value INTEGER NOT NULL
-);
+) DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
--
To view, visit https://gerrit.wikimedia.org/r/81011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I500952c9b444dea774ee0f12a0137f898dd30c45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
