mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fully remove DQS from SQL queries

Browse source
This commit is contained in:
Fedor Indutny 2023-01-18 17:06:07 -08:00 • committed by GitHub
commit 6ddb12cd99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -89,7 +89,7 @@
"@indutny/sneequals": "3.2.0", "@indutny/sneequals": "3.2.0",
"@popperjs/core": "2.11.6", "@popperjs/core": "2.11.6",
"@react-spring/web": "9.5.5", "@react-spring/web": "9.5.5",
"@signalapp/better-sqlite3": "8.1.0", "@signalapp/better-sqlite3": "8.1.1",
"@signalapp/libsignal-client": "0.21.1", "@signalapp/libsignal-client": "0.21.1",
"@signalapp/ringrtc": "2.23.0", "@signalapp/ringrtc": "2.23.0",
"@types/fabric": "4.5.3", "@types/fabric": "4.5.3",

2
ts/sql/migrations/41-uuid-keys.ts
View file

@ -138,7 +138,7 @@ export default function updateToSchemaVersion41(
db.exec( db.exec(
` `
DELETE FROM items WHERE id = "identityKey" OR id = "registrationId"; DELETE FROM items WHERE id = 'identityKey' OR id = 'registrationId';
` `
); );
}; };

4
ts/sql/migrations/index.ts
View file

@ -324,7 +324,7 @@ function updateToSchemaVersion7(
number number
) WHERE number IS NOT NULL; ) WHERE number IS NOT NULL;
INSERT INTO sessions(id, number, json) INSERT INTO sessions(id, number, json)
SELECT "+" || id, number, json FROM sessions_old; SELECT '+' || id, number, json FROM sessions_old;
DROP TABLE sessions_old; DROP TABLE sessions_old;
`); `);
@ -899,7 +899,7 @@ function updateToSchemaVersion20(
// Drop triggers // Drop triggers
const triggers = db const triggers = db
.prepare<EmptyQuery>( .prepare<EmptyQuery>(
'SELECT * FROM sqlite_master WHERE type = "trigger" AND tbl_name = "messages"' "SELECT * FROM sqlite_master WHERE type = 'trigger' AND tbl_name = 'messages'"
) )
.all(); .all();

18
ts/test-node/sql_migrations_test.ts
View file

@ -719,7 +719,7 @@ describe('SQL migrations test', () => {
updateToVersion(43); updateToVersion(43);
const { members, json: convoJSON } = db const { members, json: convoJSON } = db
.prepare('SELECT members, json FROM conversations WHERE id = "c"') .prepare("SELECT members, json FROM conversations WHERE id = 'c'")
.get(); .get();
assert.strictEqual(members, `${UUID_A} ${UUID_B}`); assert.strictEqual(members, `${UUID_A} ${UUID_B}`);
@ -742,7 +742,7 @@ describe('SQL migrations test', () => {
}); });
const { json: messageMJSON } = db const { json: messageMJSON } = db
.prepare('SELECT json FROM messages WHERE id = "m"') .prepare("SELECT json FROM messages WHERE id = 'm'")
.get(); .get();
assert.deepStrictEqual(JSON.parse(messageMJSON), { assert.deepStrictEqual(JSON.parse(messageMJSON), {
@ -770,7 +770,7 @@ describe('SQL migrations test', () => {
}); });
const { json: messageNJSON } = db const { json: messageNJSON } = db
.prepare('SELECT json FROM messages WHERE id = "n"') .prepare("SELECT json FROM messages WHERE id = 'n'")
.get(); .get();
assert.deepStrictEqual(JSON.parse(messageNJSON), { assert.deepStrictEqual(JSON.parse(messageNJSON), {
@ -800,7 +800,7 @@ describe('SQL migrations test', () => {
updateToVersion(43); updateToVersion(43);
const { json: messageMJSON } = db const { json: messageMJSON } = db
.prepare('SELECT json FROM messages WHERE id = "m"') .prepare("SELECT json FROM messages WHERE id = 'm'")
.get(); .get();
assert.deepStrictEqual(JSON.parse(messageMJSON), { assert.deepStrictEqual(JSON.parse(messageMJSON), {
@ -2368,9 +2368,9 @@ describe('SQL migrations test', () => {
INSERT INTO sticker_packs INSERT INTO sticker_packs
(id, key, lastUsed) (id, key, lastUsed)
VALUES VALUES
("a", "key-1", 1), ('a', 'key-1', 1),
("b", "key-2", 2), ('b', 'key-2', 2),
("c", "key-3", 3); ('c', 'key-3', 3);
` `
); );
@ -2401,8 +2401,8 @@ describe('SQL migrations test', () => {
.prepare( .prepare(
` `
SELECT COUNT(*) FROM sqlite_schema SELECT COUNT(*) FROM sqlite_schema
WHERE type = "table" WHERE type = 'table'
AND name = "groupCallRings" AND name = 'groupCallRings'
` `
) )
.pluck(); .pluck();

8
yarn.lock
View file

@ -2154,10 +2154,10 @@
"@react-spring/shared" "~9.5.5" "@react-spring/shared" "~9.5.5"
"@react-spring/types" "~9.5.5" "@react-spring/types" "~9.5.5"
"@signalapp/better-sqlite3@8.1.0": "@signalapp/better-sqlite3@8.1.1":
version "8.1.0" version "8.1.1"
resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.1.0.tgz#6ddbb759e4bbd572b343dc0e740836bb5c8edf0d" resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.1.1.tgz#b39b9138bc79992d5e9707b246a67a1b88a18c49"
integrity sha512-3KRDCfrlvoLYuCQ0MzcCtnzVaaivvejz6/XjCzV3tbECzH8SIc1PBASEMHSy4nAeqjY8MpETIwScW1613kFJiA== integrity sha512-k4njS/Vsr12Eow7G7TNBjJKSPU971DZQWGY4dfISdOBobAAiewstOwlqF3ZhpJznL6M3sri14MUM0iV1aZR15g==
dependencies: dependencies:
bindings "^1.5.0" bindings "^1.5.0"
tar "^6.1.0" tar "^6.1.0"