@verdnatura/myt 1.5.19 → 1.5.21

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "@verdnatura/myt",
-  "version": "1.5.19",
-  "author": "Verdnatura Levante SL",
-  "description": "MySQL version control",
-  "license": "GPL-3.0",
-  "bin": {
-    "myt": "cli.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/verdnatura/myt.git"
-  },
-  "dependencies": {
-    "@sqltools/formatter": "^1.2.5",
-    "colors": "^1.4.0",
-    "ejs": "^3.1.9",
-    "fs-extra": "^8.1.0",
-    "getopts": "^2.3.0",
-    "ini": "^1.3.8",
-    "mysql2": "^2.3.3",
-    "nodegit": "^0.27.0",
-    "require-yaml": "^0.0.1",
-    "sha.js": "^2.4.11"
-  },
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "mysql",
-    "mariadb",
-    "migrations",
-    "git",
-    "vcs",
-    "database",
-    "version",
-    "control",
-    "sql"
-  ]
-}
+{
+  "name": "@verdnatura/myt",
+  "version": "1.5.21",
+  "author": "Verdnatura Levante SL",
+  "description": "MySQL version control",
+  "license": "GPL-3.0",
+  "bin": {
+    "myt": "cli.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/verdnatura/myt.git"
+  },
+  "dependencies": {
+    "@sqltools/formatter": "^1.2.5",
+    "colors": "^1.4.0",
+    "ejs": "^3.1.9",
+    "fs-extra": "^11.1.1",
+    "getopts": "^2.3.0",
+    "ini": "^4.1.1",
+    "mysql2": "^3.3.4",
+    "nodegit": "^0.27.0",
+    "require-yaml": "^0.0.1",
+    "sha.js": "^2.4.11"
+  },
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "mysql",
+    "mariadb",
+    "migrations",
+    "git",
+    "vcs",
+    "database",
+    "version",
+    "control",
+    "sql"
+  ]
+}

package/server/Dockerfile.base

@@ -1 +1 @@
-FROM mysql:5.6
+FROM mysql:5.6

package/server/Dockerfile.client

@@ -1,14 +1,14 @@
-FROM debian:bullseye-slim
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        mariadb-client \
-        libmariadb3 \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY \
-    server/docker-dump.sh \
-    server/docker-fixtures.sh \
-    /usr/local/bin/
-WORKDIR /workspace
+FROM debian:bullseye-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        mariadb-client \
+        libmariadb3 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY \
+    server/docker-dump.sh \
+    server/docker-fixtures.sh \
+    /usr/local/bin/
+WORKDIR /workspace

package/server/Dockerfile.dump

@@ -1,16 +1,13 @@
-FROM myt/server
-
-USER root
-
-COPY \
-    .dump.sql  \
-    beforeDump.sql \
-    afterDump.sql \
-    dump/
-
-RUN gosu mysql docker-init.sh
-
-RUN echo "[LOG] Import finished." \
-    && rm -rf /workspace
-
-USER mysql
+FROM myt/server
+
+USER root
+
+COPY .dump dump/.dump
+COPY dump.*.sql dump/
+
+RUN gosu mysql docker-init.sh
+
+RUN echo "[LOG] Import finished." \
+    && rm -rf /workspace
+
+USER mysql

package/server/Dockerfile.server

@@ -1,25 +1,25 @@
-FROM myt/base
-
-USER root
-ENV MYSQL_ROOT_PASSWORD root
-
-RUN mkdir /mysql-data \
-    && chown -R mysql:mysql /mysql-data
-
-WORKDIR /workspace
-
-COPY docker.cnf /etc/mysql/conf.d/
-COPY \
-    docker-init.sh \
-    docker-import.sh \
-    docker-start.sh \
-    /usr/local/bin/
-
-USER mysql
-
-ENTRYPOINT ["docker-start.sh"]
-
-CMD ["mysqld"]
-
-HEALTHCHECK --interval=2s --timeout=10s --retries=200 \
-    CMD mysqladmin ping -h 127.0.0.1 -u root --password=root || exit 1
+FROM myt/base
+
+USER root
+ENV MYSQL_ROOT_PASSWORD root
+
+RUN mkdir /mysql-data \
+    && chown -R mysql:mysql /mysql-data
+
+WORKDIR /workspace
+
+COPY docker.cnf /etc/mysql/conf.d/
+COPY \
+    docker-init.sh \
+    docker-import.sh \
+    docker-start.sh \
+    /usr/local/bin/
+
+USER mysql
+
+ENTRYPOINT ["docker-start.sh"]
+
+CMD ["mysqld"]
+
+HEALTHCHECK --interval=2s --timeout=10s --retries=200 \
+    CMD mysqladmin ping -h 127.0.0.1 -u root --password=root || exit 1

package/server/docker-dump.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
-
-# FIXME: It can corrupt data
-mysqldump $@ | sed 's/ AUTO_INCREMENT=[0-9]*//g'
+#!/bin/bash
+
+# FIXME: It can corrupt data
+mysqldump $@ | sed 's/ AUTO_INCREMENT=[0-9]*//g'

package/server/docker-fixtures.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
-
-# FIXME: It can corrupt data
-mysqldump $@ | sed -E 's/(VALUES |\),)\(/\1\n\t\(/g'
+#!/bin/bash
+
+# FIXME: It can corrupt data
+# Currently not used, instead mysqldump --skip-extended-insert option is used
+mysqldump $@ | sed -E 's/(VALUES |\),)\(/\1\n\t\(/g'

package/server/docker-import.sh

@@ -1,6 +1,10 @@
-#!/bin/bash
-
-FILE="$1.sql"
-echo "[LOG] -> Importing $FILE"
-export MYSQL_PWD=root
-mysql -u root --default-character-set=utf8 --comments -f < "$FILE"
+#!/bin/bash
+
+FILE="$1.sql"
+if [[ ! -f "$FILE" ]] ; then
+    exit
+fi
+
+echo "[LOG] -> Importing $FILE"
+export MYSQL_PWD=root
+mysql -u root --default-character-set=utf8 --comments -f < "$FILE"

package/server/docker-init.sh

@@ -1,20 +1,23 @@
-#!/bin/bash
-
-. /usr/local/bin/docker-entrypoint.sh
-CMD=mysqld
-
-mysql_check_config "$CMD"
-docker_setup_env "$CMD"
-docker_create_db_directories
-
-docker_verify_minimum_env
-docker_init_database_dir "$CMD"
-docker_temp_server_start "$CMD"
-docker_setup_db
-docker_process_init_files /docker-entrypoint-initdb.d/*
-
-docker-import.sh dump/beforeDump
-docker-import.sh dump/.dump
-docker-import.sh dump/afterDump
-
-docker_temp_server_stop
+#!/bin/bash
+
+. /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
+
+mysql_check_config "$CMD"
+docker_setup_env "$CMD"
+docker_create_db_directories
+
+docker_verify_minimum_env
+docker_init_database_dir "$CMD"
+docker_temp_server_start "$CMD"
+docker_setup_db
+docker_process_init_files /docker-entrypoint-initdb.d/*
+
+docker-import.sh dump/dump.before
+docker-import.sh dump/.dump/structure
+docker-import.sh dump/.dump/data
+docker-import.sh dump/.dump/triggers
+docker-import.sh dump/.dump/privileges
+docker-import.sh dump/dump.after
+
+docker_temp_server_stop

package/server/docker-start.sh

@@ -1,10 +1,10 @@
-#!/bin/bash
-
-# XXX: Workaround to avoid OverlayFS bug on MacOs
-# https://docs.docker.com/storage/storagedriver/overlayfs-driver/#limitations-on-overlayfs-compatibility
-
-if [ "$RUN_CHOWN" = "true" ]; then
-	chown -R mysql:mysql /mysql-data
-fi
-
-exec "$@"
+#!/bin/bash
+
+# XXX: Workaround to avoid OverlayFS bug on MacOs
+# https://docs.docker.com/storage/storagedriver/overlayfs-driver/#limitations-on-overlayfs-compatibility
+
+if [ "$RUN_CHOWN" = "true" ]; then
+	chown -R mysql:mysql /mysql-data
+fi
+
+exec "$@"

package/server/docker.cnf

@@ -1,9 +1,9 @@
-[mysqld]
-innodb_log_file_size = 4M
-innodb_autoextend_increment = 4
-innodb_page_size = 16K
-log_bin_trust_function_creators = ON
-datadir = /mysql-data
-sql_mode = NO_ENGINE_SUBSTITUTION
-table_definition_cache = 1024
-skip-log-bin
+[mysqld]
+innodb_log_file_size = 4M
+innodb_autoextend_increment = 4
+innodb_page_size = 16K
+log_bin_trust_function_creators = ON
+datadir = /mysql-data
+sql_mode = NO_ENGINE_SUBSTITUTION
+table_definition_cache = 1024
+skip-log-bin

package/template/dump/Dockerfile.base

@@ -1 +1 @@
-FROM mariadb:10.7
+FROM mariadb:10.7

package/template/dump/dump.after.sql

@@ -0,0 +1 @@
+-- Executed after dump

package/template/dump/dump.before.sql

@@ -0,0 +1 @@
+-- Executed before dump

package/template/dump/fixtures.after.sql

@@ -0,0 +1 @@
+-- Executed after fixtures

package/template/dump/fixtures.before.sql

@@ -0,0 +1 @@
+-- Executed before fixtures

package/template/myt.config.yml

@@ -1,11 +1,11 @@
-code: my-db
-schemas:
-  - myt
-  - my_db
-fixtures:
-  myt:
-    - version
-    - versionLog
-  my_db:
-    - table1
-    - table2
+code: my-db
+schemas:
+  - myt
+  - my_db
+fixtures:
+  myt:
+    - version
+    - versionLog
+  my_db:
+    - table1
+    - table2

package/template/package.json

@@ -1,13 +1,13 @@
-{
-    "name": "my-db",
-    "version": "1.0.0",
-    "author": "Me",
-    "description": "My database project",
-    "license": "GPL-3.0",
-    "repository": {
-        "type": "git"
-    },
-    "dependencies": {
-        "@verdnatura/myt": "^1.0.0"
-    }
-}
+{
+    "name": "my-db",
+    "version": "1.0.0",
+    "author": "Me",
+    "description": "My database project",
+    "license": "GPL-3.0",
+    "repository": {
+        "type": "git"
+    },
+    "dependencies": {
+        "@verdnatura/myt": "^1.0.0"
+    }
+}

package/template/remotes/docker.ini

@@ -1,5 +1,5 @@
-[client]
-host = host.docker.internal
-port = 3306
-user = root
+[client]
+host = host.docker.internal
+port = 3306
+user = root
 password = root

package/template/remotes/local.ini

@@ -1,5 +1,5 @@
-[client]
-host = 172.16.0.1
-port = 3306
-user = root
-password = root
+[client]
+host = 172.16.0.1
+port = 3306
+user = root
+password = root

package/template/routines/README.md

@@ -1 +1 @@
-Routines will be automatically created here.
+Routines will be automatically created here.

package/template/versions/00001-firstVersion/00-firstScript.sql

@@ -1 +1 @@
--- Place your SQL code here
+-- Place your SQL code here

package/template/versions/README.md

@@ -1 +1 @@
-Place your versions here.
+Place your versions here.

package/template/dump/afterDump.sql

@@ -1 +0,0 @@
--- Executed after data dump

package/template/dump/beforeDump.sql

@@ -1 +0,0 @@
--- Executed before data dump

package/template/dump/fixtures.sql

@@ -1 +0,0 @@
--- Place your local fixtures here