@tasenor/common-node 1.13.24 → 1.13.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/src/database/DB.js
CHANGED
|
@@ -262,14 +262,14 @@ const destroy = async (masterDb, name, hostOverride = null) => {
|
|
|
262
262
|
return 'Database not found.';
|
|
263
263
|
}
|
|
264
264
|
const dbToDelete = await get(masterDb, name, hostOverride);
|
|
265
|
-
await dbToDelete.raw(`DROP OWNED BY ${db.user}`);
|
|
265
|
+
await dbToDelete.raw(`DROP OWNED BY "${db.user}"`);
|
|
266
266
|
disconnect(name);
|
|
267
267
|
await masterDb('database_users').where({ database_id: db.id }).delete();
|
|
268
268
|
await masterDb('databases').where({ id: db.id }).delete();
|
|
269
269
|
const rootDb = getRoot();
|
|
270
|
-
await rootDb.raw(`DROP OWNED BY ${db.user}`);
|
|
271
|
-
await rootDb.raw(`DROP USER ${db.user}`);
|
|
272
|
-
await rootDb.raw(`DROP DATABASE ${db.name} WITH (FORCE)`);
|
|
270
|
+
await rootDb.raw(`DROP OWNED BY "${db.user}"`);
|
|
271
|
+
await rootDb.raw(`DROP USER "${db.user}"`);
|
|
272
|
+
await rootDb.raw(`DROP DATABASE "${db.name}" WITH (FORCE)`);
|
|
273
273
|
return null;
|
|
274
274
|
};
|
|
275
275
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DB.js","sourceRoot":"","sources":["../../../src/database/DB.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DB.js","sourceRoot":"","sources":["../../../src/database/DB.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tasenor/common-node",
|
|
3
|
-
"version": "1.13.
|
|
3
|
+
"version": "1.13.26",
|
|
4
4
|
"description": "Common Node-parts of Tasenor project",
|
|
5
5
|
"main": "src/index.ts",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"sqlite3": "^5.1.7",
|
|
36
36
|
"tar": "^6.2.0",
|
|
37
37
|
"ts-opaque": "^3.0.1",
|
|
38
|
-
"@tasenor/common": "1.13.
|
|
38
|
+
"@tasenor/common": "1.13.26"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@jest/globals": "^29.7.0",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"jest": "^29.7.0",
|
|
45
45
|
"ts-jest": "^29.1.2",
|
|
46
46
|
"typescript": "^5.3.3",
|
|
47
|
-
"@tasenor/config": "1.13.
|
|
47
|
+
"@tasenor/config": "1.13.26",
|
|
48
48
|
"eslint-config-tasenor": "0.0.0"
|
|
49
49
|
},
|
|
50
50
|
"scripts": {
|
package/src/database/DB.ts
CHANGED
|
@@ -296,7 +296,7 @@ const destroy = async (masterDb: KnexDatabase, name: DatabaseName, hostOverride:
|
|
|
296
296
|
return 'Database not found.'
|
|
297
297
|
}
|
|
298
298
|
const dbToDelete = await get(masterDb, name, hostOverride)
|
|
299
|
-
await dbToDelete.raw(`DROP OWNED BY ${db.user}`)
|
|
299
|
+
await dbToDelete.raw(`DROP OWNED BY "${db.user}"`)
|
|
300
300
|
|
|
301
301
|
disconnect(name)
|
|
302
302
|
|
|
@@ -304,9 +304,9 @@ const destroy = async (masterDb: KnexDatabase, name: DatabaseName, hostOverride:
|
|
|
304
304
|
await masterDb('databases').where({ id: db.id }).delete()
|
|
305
305
|
|
|
306
306
|
const rootDb = getRoot()
|
|
307
|
-
await rootDb.raw(`DROP OWNED BY ${db.user}`)
|
|
308
|
-
await rootDb.raw(`DROP USER ${db.user}`)
|
|
309
|
-
await rootDb.raw(`DROP DATABASE ${db.name} WITH (FORCE)`)
|
|
307
|
+
await rootDb.raw(`DROP OWNED BY "${db.user}"`)
|
|
308
|
+
await rootDb.raw(`DROP USER "${db.user}"`)
|
|
309
|
+
await rootDb.raw(`DROP DATABASE "${db.name}" WITH (FORCE)`)
|
|
310
310
|
|
|
311
311
|
return null
|
|
312
312
|
}
|