larvitdbmigration
Advanced tools
Comparing version 1.0.2 to 1.1.0
28
index.js
'use strict'; | ||
const async = require('async'), | ||
mysql = require('mysql'), | ||
log = require('winston'), | ||
fs = require('fs'), | ||
db = require('larvitdb'), | ||
_ = require('lodash'); | ||
const async = require('async'), | ||
mysql = require('mysql'), | ||
log = require('winston'), | ||
fs = require('fs'), | ||
db = require('larvitdb'), | ||
_ = require('lodash'); | ||
@@ -15,4 +15,4 @@ let dbCon; | ||
if (options.tableName === undefined) options.tableName = 'db_version'; | ||
if (options.migrationScriptsPath === undefined) options.migrationScriptsPath = './dbmigration'; | ||
if (options.tableName === undefined) options.tableName = 'db_version'; | ||
if (options.migrationScriptsPath === undefined) options.migrationScriptsPath = './dbmigration'; | ||
@@ -28,6 +28,3 @@ log.verbose('larvitdbmigration: Started with options: ' + JSON.stringify(options)); | ||
db.query('UPDATE `' + options.tableName + '` SET running = 1', function(err, res) { | ||
if (err) { | ||
cb(err); | ||
return; | ||
} | ||
if (err) { cb(err); return; } | ||
@@ -101,6 +98,3 @@ if (res.changedRows === 0) { | ||
db.query(sql, function(err) { | ||
if (err) { | ||
cb(err); | ||
return; | ||
} | ||
if (err) { cb(err); return; } | ||
@@ -189,2 +183,2 @@ runScripts(parseInt(startVersion) + 1, cb); | ||
}; | ||
}; | ||
}; |
@@ -11,3 +11,3 @@ { | ||
"async": "^1.5.2", | ||
"larvitdb": "^1.0.0", | ||
"larvitdb": "^1.2.0", | ||
"lodash": "^4.7.0", | ||
@@ -39,3 +39,3 @@ "mysql": "^2.10.2", | ||
}, | ||
"version": "1.0.2", | ||
"version": "1.1.0", | ||
"readmeFilename": "README.md", | ||
@@ -42,0 +42,0 @@ "scripts": { |
@@ -27,6 +27,6 @@ [![Build Status](https://travis-ci.org/larvit/larvitdbmigration.svg?branch=master)](https://travis-ci.org/larvit/larvitdbmigration) [![Dependencies](https://david-dm.org/larvit/larvitdbmigration.svg)](https://david-dm.org/larvit/larvitdbmigration.svg) | ||
dbMigration({ | ||
'host': '127.0.0.1', | ||
'user': 'foo', | ||
'password': 'bar', | ||
'database': 'baz' | ||
'host': '127.0.0.1', | ||
'user': 'foo', | ||
'password': 'bar', | ||
'database': 'baz' | ||
})(function(err) { | ||
@@ -44,10 +44,10 @@ if (err) { | ||
```javascript | ||
const dbMigration = require('larvitdbmigration'), | ||
db = require('larvitdb'); | ||
const dbMigration = require('larvitdbmigration'), | ||
db = require('larvitdb'); | ||
db.setup({ | ||
'host': '127.0.0.1', | ||
'user': 'foo', | ||
'password': 'bar', | ||
'database': 'baz' | ||
'host': '127.0.0.1', | ||
'user': 'foo', | ||
'password': 'bar', | ||
'database': 'baz' | ||
}); | ||
@@ -68,6 +68,6 @@ | ||
dbMigration({ | ||
'host': '127.0.0.1', | ||
'user': 'bar', | ||
'password': 'bar', | ||
'database': 'bar' | ||
'host': '127.0.0.1', | ||
'user': 'bar', | ||
'password': 'bar', | ||
'database': 'bar' | ||
})(function(err) { | ||
@@ -80,8 +80,8 @@ ``` | ||
dbMigration({ | ||
'host': '127.0.0.1', | ||
'user': 'bar', | ||
'password': 'bar', | ||
'database': 'bar', | ||
'tableName': 'db_version', | ||
'migrationScriptsPath': './dbmigration' | ||
'host': '127.0.0.1', | ||
'user': 'bar', | ||
'password': 'bar', | ||
'database': 'bar', | ||
'tableName': 'db_version', | ||
'migrationScriptsPath': './dbmigration' | ||
})(function(err) { | ||
@@ -88,0 +88,0 @@ ``` |
'use strict'; | ||
const assert = require('assert'), | ||
path = require('path'), | ||
log = require('winston'), | ||
db = require('larvitdb'), | ||
fs = require('fs'); | ||
const assert = require('assert'), | ||
path = require('path'), | ||
log = require('winston'), | ||
db = require('larvitdb'), | ||
fs = require('fs'); | ||
@@ -14,10 +14,10 @@ let dbConf; | ||
log.add(log.transports.Console, { | ||
'level': 'warn', | ||
'colorize': true, | ||
'timestamp': true, | ||
'json': false | ||
'level': 'warn', | ||
'colorize': true, | ||
'timestamp': true, | ||
'json': false | ||
}); | ||
before(function(done) { | ||
let confFile; | ||
let confFile; | ||
@@ -52,6 +52,7 @@ function checkEmptyDb() { | ||
if (process.argv[3] === undefined) | ||
if (process.argv[3] === undefined) { | ||
confFile = __dirname + '/../config/db_test.json'; | ||
else | ||
} else { | ||
confFile = process.argv[3].split('=')[1]; | ||
} | ||
@@ -67,4 +68,3 @@ log.verbose('DB config file: "' + confFile + '"'); | ||
fs.stat(altConfFile, function(err) { | ||
if (err) | ||
assert( ! err, 'fs.stat failed: ' + err.message); | ||
assert( ! err, 'fs.stat failed: ' + err.message); | ||
@@ -98,11 +98,24 @@ if ( ! err) { | ||
db.query('SELECT * FROM bloj', function(err, rows) { | ||
assert( ! err, 'err should be negative'); | ||
done(); | ||
}); | ||
}); | ||
assert.deepEqual(rows.length, 1); | ||
assert.deepEqual(rows[0].hasse, 42); | ||
done(); | ||
}); | ||
it('Should fetch some data form a migrated table', function(done) { | ||
db.query('SELECT * FROM bloj', function(err, rows) { | ||
assert( ! err, 'err should be negative'); | ||
assert.deepEqual(rows.length, 1); | ||
assert.deepEqual(rows[0].hasse, 42); | ||
done(); | ||
}); | ||
}); | ||
}); | ||
/*it('Make sure function works', function(done) { | ||
db.query('SELECT multi_two(4)', function(err, rows) { | ||
assert( ! err, 'err should be negative'); | ||
assert.deepEqual(rows[0], 8); | ||
done(); | ||
}); | ||
});*/ | ||
}); |
'use strict'; | ||
const async = require('async'), | ||
db = require('larvitdb'); | ||
const async = require('async'), | ||
db = require('larvitdb'); | ||
@@ -6,0 +6,0 @@ exports = module.exports = function(cb) { |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
14412
11
256
Updatedlarvitdb@^1.2.0