Merge pull request #28 from kriasoft/fix-migration-bug

Fix migration bug where using -- as an actual string value gets lost

Author: Theo Gravity

migrations/003-test-cert.sql

@@ -0,0 +1,9 @@
+-- Up
+CREATE TABLE whatever ( certificate TEXT );
+INSERT INTO whatever ( certificate ) VALUES (
+  '-----BEGIN CERTIFICATE-----
+some contents
+-----END CERTIFICATE-----');
+
+-- Down
+DROP TABLE whatever;

src/Database.js

@@ -167,8 +167,8 @@ class Database {
             reject(new Error(message));
           } else {
             /* eslint-disable no-param-reassign */
-            migration.up = up.replace(/^--.*?$/gm, '').trim();     // Remove comments
-            migration.down = down.replace(/^--.*?$/gm, '').trim(); // and trim whitespaces
+            migration.up = up.replace(/^-- .*?$/gm, '').trim();// Remove comments
+            migration.down = down.trim(); // and trim whitespaces
             /* eslint-enable no-param-reassign */
             resolve();
           }

test/spec.js

@@ -149,11 +149,16 @@ it('Should migrate the database', (done) => {
   let p = db.open(':memory:');
   p = p.then(() => db.migrate());
   p = p.then(() => db.all('SELECT id, name FROM migrations').then((result) => {
-    expect(result).to.be.deep.equal([{ id: 1, name: 'initial' }, { id: 2, name: 'some-feature' }]);
+    expect(result).to.be.deep.equal([{ id: 1, name: 'initial' }, { id: 2, name: 'some-feature' }, { id: 3, name: 'test-cert' }]);
   }));
   p = p.then(() => db.all('SELECT * FROM Category').then((result) => {
     expect(result).to.be.deep.equal([{ id: 1, name: 'Test' }]);
   }));
+
+  p = p.then(() => db.all('SELECT certificate from whatever').then((result) => {
+    expect(result[0].certificate).to.be.equal('-----BEGIN CERTIFICATE-----\nsome contents\n-----END CERTIFICATE-----');
+  }));
+
   p = p.then(() => db.close());
   p.then(done, done);
 });