Compare commits

..

No commits in common. "master" and "v1.6.11" have entirely different histories.

5 changed files with 6 additions and 14 deletions

View File

@ -7,9 +7,6 @@ mockFunctions:
- mockUtcTime - mockUtcTime
sumViews: true sumViews: true
defaultDefiner: root@localhost defaultDefiner: root@localhost
localRemotes:
- local
- docker
deprecMarkRegex: __$ deprecMarkRegex: __$
deprecCommentRegex: ^@deprecated [0-9]{4}-[0-9]{2}-[0-9]{2} deprecCommentRegex: ^@deprecated [0-9]{4}-[0-9]{2}-[0-9]{2}
deprecDateRegex: '[0-9]{4}-[0-9]{2}-[0-9]{2}' deprecDateRegex: '[0-9]{4}-[0-9]{2}-[0-9]{2}'

View File

@ -371,12 +371,9 @@ class Push extends Command {
const oldSql = await engine.fetchRoutine(type, schema, name); const oldSql = await engine.fetchRoutine(type, schema, name);
const oldSum = engine.getShaSum(type, schema, name); const oldSum = engine.getShaSum(type, schema, name);
const localRemote = opts.remote == null
|| opts.localRemotes?.indexOf(opts.remote) !== -1;
const isMockFn = type == 'function' const isMockFn = type == 'function'
&& schema == opts.versionSchema && schema == opts.versionSchema
&& localRemote && opts.remote == 'local'
&& opts.mockDate && opts.mockDate
&& opts.mockFunctions && opts.mockFunctions
&& opts.mockFunctions.indexOf(name) !== -1; && opts.mockFunctions.indexOf(name) !== -1;

View File

@ -125,14 +125,13 @@ class Run extends Command {
try { try {
const server = new Server(ct, dbConfig); const server = new Server(ct, dbConfig);
const useCustom = opts.ci || opts.network if (isRandom) {
if (isRandom || useCustom) {
try { try {
const netSettings = await ct.inspect({ const netSettings = await ct.inspect({
format: '{{json .NetworkSettings}}' format: '{{json .NetworkSettings}}'
}); });
if (useCustom) { if (opts.ci || opts.network) {
dbConfig.host = opts.network dbConfig.host = opts.network
? netSettings.Networks[opts.network].IPAddress ? netSettings.Networks[opts.network].IPAddress
: netSettings.Gateway; : netSettings.Gateway;

5
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@verdnatura/myt", "name": "@verdnatura/myt",
"version": "1.6.13", "version": "1.6.10",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@verdnatura/myt", "name": "@verdnatura/myt",
"version": "1.6.13", "version": "1.6.10",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@sqltools/formatter": "^1.2.5", "@sqltools/formatter": "^1.2.5",
@ -1169,7 +1169,6 @@
"resolved": "https://registry.npmjs.org/nodegit/-/nodegit-0.27.0.tgz", "resolved": "https://registry.npmjs.org/nodegit/-/nodegit-0.27.0.tgz",
"integrity": "sha512-E9K4gPjWiA0b3Tx5lfWCzG7Cvodi2idl3V5UD2fZrOrHikIfrN7Fc2kWLtMUqqomyoToYJLeIC8IV7xb1CYRLA==", "integrity": "sha512-E9K4gPjWiA0b3Tx5lfWCzG7Cvodi2idl3V5UD2fZrOrHikIfrN7Fc2kWLtMUqqomyoToYJLeIC8IV7xb1CYRLA==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT",
"dependencies": { "dependencies": {
"fs-extra": "^7.0.0", "fs-extra": "^7.0.0",
"got": "^10.7.0", "got": "^10.7.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "@verdnatura/myt", "name": "@verdnatura/myt",
"version": "1.6.13", "version": "1.6.11",
"author": "Verdnatura Levante SL", "author": "Verdnatura Levante SL",
"description": "MySQL version control", "description": "MySQL version control",
"license": "GPL-3.0", "license": "GPL-3.0",