fix(sqlite): fix wrongly overwriting storage if empty string (#13376)

soryy708 · sdepold · web-flow · commit c3e608b95a13 · 2021-10-17T13:28:31.000+02:00
* fix(sqlite): fix wrongly overwriting storage if empty string Empty string in SQLite3 means anonymous disk-based db, but sequelize overwrited it with :memory: Closes #13375 * fix(sqlite): fix node<10 chokes on nullish coalescing operator * refactor(sqlite): remove unnecessary parentheses around expression Co-authored-by: Sascha Depold <sdepold@users.noreply.github.com>
diff --git a/lib/dialects/sqlite/connection-manager.js b/lib/dialects/sqlite/connection-manager.js
@@ -45,7 +45,7 @@ class ConnectionManager extends AbstractConnectionManager {
   async getConnection(options) {
     options = options || {};
     options.uuid = options.uuid || 'default';
-    options.storage = this.sequelize.options.storage || this.sequelize.options.host || ':memory:';
+    options.storage = this.sequelize.options.storage !== null && this.sequelize.options.storage !== undefined ? this.sequelize.options.storage : this.sequelize.options.host || ':memory:';
     options.inMemory = options.storage === ':memory:' ? 1 : 0;
 
     const dialectOptions = this.sequelize.options.dialectOptions;
diff --git a/test/support.js b/test/support.js
@@ -113,7 +113,7 @@ const Support = {
       sequelizeOptions.native = true;
     }
 
-    if (config.storage) {
+    if (config.storage || config.storage === '') {
       sequelizeOptions.storage = config.storage;
     }
 
diff --git a/test/unit/dialects/sqlite/connection-manager.test.js b/test/unit/dialects/sqlite/connection-manager.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const chai = require('chai'),
+  expect = chai.expect,
+  Support = require('../../support'),
+  Sequelize = Support.Sequelize,
+  dialect = Support.getTestDialect(),
+  sinon = require('sinon');
+
+if (dialect === 'sqlite') {
+  describe('connectionManager', () => {
+    describe('getConnection', () => {
+      it('Should respect storage=\'\'', () => {
+        // storage='' means anonymous disk-based database
+        const sequelize = new Sequelize('', '', '', { dialect: 'sqlite', storage: '' });
+        sinon.stub(sequelize.connectionManager, 'lib').value({
+          Database: function FakeDatabase(_s, _m, cb) {
+            cb();
+            return {};
+          }
+        });
+        sinon.stub(sequelize.connectionManager, 'connections').value({ default: { run: () => {} } });
+        const options = {};
+        sequelize.dialect.connectionManager.getConnection(options);
+        expect(options.storage).to.be.equal('');
+      });
+    });
+  });
+}

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ const Support = {`
`113`	`113`	`sequelizeOptions.native = true;`
`114`	`114`	`}`
`115`	`115`
`116`		`- if (config.storage) {`
	`116`	`+ if (config.storage \|\| config.storage === '') {`
`117`	`117`	`sequelizeOptions.storage = config.storage;`
`118`	`118`	`}`
`119`	`119`