@sqlanvil/cli 1.18.0 → 1.19.0

package/bundle.js

@@ -5888,6 +5888,7 @@ const sqlanvil = $root.sqlanvil = (() => {
              * @property {sqlanvil.ActionConfig.IMetadata|null} [metadata] ViewConfig metadata
              * @property {string|null} [reservation] ViewConfig reservation
              * @property {sqlanvil.IPostgresOptions|null} [postgres] ViewConfig postgres
+             * @property {sqlanvil.IMysqlOptions|null} [mysql] ViewConfig mysql
              */
 
             /**
@@ -6089,6 +6090,14 @@ const sqlanvil = $root.sqlanvil = (() => {
              */
             ViewConfig.prototype.postgres = null;
 
+            /**
+             * ViewConfig mysql.
+             * @member {sqlanvil.IMysqlOptions|null|undefined} mysql
+             * @memberof sqlanvil.ActionConfig.ViewConfig
+             * @instance
+             */
+            ViewConfig.prototype.mysql = null;
+
             /**
              * Creates a new ViewConfig instance using the specified properties.
              * @function create
@@ -6169,6 +6178,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     writer.uint32(/* id 21, wireType 2 =*/170).string(message.reservation);
                 if (message.postgres != null && Object.hasOwnProperty.call(message, "postgres"))
                     $root.sqlanvil.PostgresOptions.encode(message.postgres, writer.uint32(/* id 22, wireType 2 =*/178).fork(), q + 1).ldelim();
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql"))
+                    $root.sqlanvil.MysqlOptions.encode(message.mysql, writer.uint32(/* id 23, wireType 2 =*/186).fork(), q + 1).ldelim();
                 return writer;
             };
 
@@ -6351,6 +6362,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                             message.postgres = $root.sqlanvil.PostgresOptions.decode(reader, reader.uint32(), undefined, long + 1);
                             break;
                         }
+                    case 23: {
+                            message.mysql = $root.sqlanvil.MysqlOptions.decode(reader, reader.uint32(), undefined, long + 1);
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7, long);
                         break;
@@ -6500,6 +6515,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (error)
                         return "postgres." + error;
                 }
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql")) {
+                    let error = $root.sqlanvil.MysqlOptions.verify(message.mysql, long + 1);
+                    if (error)
+                        return "mysql." + error;
+                }
                 return null;
             };
 
@@ -6626,6 +6646,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                         throw TypeError(".sqlanvil.ActionConfig.ViewConfig.postgres: object expected");
                     message.postgres = $root.sqlanvil.PostgresOptions.fromObject(object.postgres, long + 1);
                 }
+                if (object.mysql != null) {
+                    if (!$util.isObject(object.mysql))
+                        throw TypeError(".sqlanvil.ActionConfig.ViewConfig.mysql: object expected");
+                    message.mysql = $root.sqlanvil.MysqlOptions.fromObject(object.mysql, long + 1);
+                }
                 return message;
             };
 
@@ -6673,6 +6698,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                     object.metadata = null;
                     object.reservation = "";
                     object.postgres = null;
+                    object.mysql = null;
                 }
                 if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                     object.name = message.name;
@@ -6749,6 +6775,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     object.reservation = message.reservation;
                 if (message.postgres != null && Object.hasOwnProperty.call(message, "postgres"))
                     object.postgres = $root.sqlanvil.PostgresOptions.toObject(message.postgres, options, q + 1);
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql"))
+                    object.mysql = $root.sqlanvil.MysqlOptions.toObject(message.mysql, options, q + 1);
                 return object;
             };
 
@@ -16490,6 +16518,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [engine] MysqlOptions engine
          * @property {string|null} [charset] MysqlOptions charset
          * @property {string|null} [collation] MysqlOptions collation
+         * @property {string|null} [rowFormat] MysqlOptions rowFormat
          * @property {Array.<sqlanvil.MysqlOptions.IIndex>|null} [indexes] MysqlOptions indexes
          * @property {sqlanvil.MysqlOptions.IPartition|null} [partition] MysqlOptions partition
          */
@@ -16534,6 +16563,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         MysqlOptions.prototype.collation = "";
 
+        /**
+         * MysqlOptions rowFormat.
+         * @member {string} rowFormat
+         * @memberof sqlanvil.MysqlOptions
+         * @instance
+         */
+        MysqlOptions.prototype.rowFormat = "";
+
         /**
          * MysqlOptions indexes.
          * @member {Array.<sqlanvil.MysqlOptions.IIndex>} indexes
@@ -16589,6 +16626,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     $root.sqlanvil.MysqlOptions.Index.encode(message.indexes[i], writer.uint32(/* id 4, wireType 2 =*/34).fork(), q + 1).ldelim();
             if (message.partition != null && Object.hasOwnProperty.call(message, "partition"))
                 $root.sqlanvil.MysqlOptions.Partition.encode(message.partition, writer.uint32(/* id 5, wireType 2 =*/42).fork(), q + 1).ldelim();
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                writer.uint32(/* id 6, wireType 2 =*/50).string(message.rowFormat);
             return writer;
         };
 
@@ -16641,6 +16680,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.collation = reader.string();
                         break;
                     }
+                case 6: {
+                        message.rowFormat = reader.string();
+                        break;
+                    }
                 case 4: {
                         if (!(message.indexes && message.indexes.length))
                             message.indexes = [];
@@ -16699,6 +16742,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.collation != null && Object.hasOwnProperty.call(message, "collation"))
                 if (!$util.isString(message.collation))
                     return "collation: string expected";
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                if (!$util.isString(message.rowFormat))
+                    return "rowFormat: string expected";
             if (message.indexes != null && Object.hasOwnProperty.call(message, "indexes")) {
                 if (!Array.isArray(message.indexes))
                     return "indexes: array expected";
@@ -16740,6 +16786,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.charset = String(object.charset);
             if (object.collation != null)
                 message.collation = String(object.collation);
+            if (object.rowFormat != null)
+                message.rowFormat = String(object.rowFormat);
             if (object.indexes) {
                 if (!Array.isArray(object.indexes))
                     throw TypeError(".sqlanvil.MysqlOptions.indexes: array expected");
@@ -16782,6 +16830,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.charset = "";
                 object.collation = "";
                 object.partition = null;
+                object.rowFormat = "";
             }
             if (message.engine != null && Object.hasOwnProperty.call(message, "engine"))
                 object.engine = message.engine;
@@ -16796,6 +16845,8 @@ const sqlanvil = $root.sqlanvil = (() => {
             }
             if (message.partition != null && Object.hasOwnProperty.call(message, "partition"))
                 object.partition = $root.sqlanvil.MysqlOptions.Partition.toObject(message.partition, options, q + 1);
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                object.rowFormat = message.rowFormat;
             return object;
         };
 
@@ -16834,6 +16885,7 @@ const sqlanvil = $root.sqlanvil = (() => {
              * @property {string|null} [name] Index name
              * @property {Array.<string>|null} [columns] Index columns
              * @property {boolean|null} [unique] Index unique
+             * @property {string|null} [type] Index type
              */
 
             /**
@@ -16876,6 +16928,14 @@ const sqlanvil = $root.sqlanvil = (() => {
              */
             Index.prototype.unique = false;
 
+            /**
+             * Index type.
+             * @member {string} type
+             * @memberof sqlanvil.MysqlOptions.Index
+             * @instance
+             */
+            Index.prototype.type = "";
+
             /**
              * Creates a new Index instance using the specified properties.
              * @function create
@@ -16911,6 +16971,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                         writer.uint32(/* id 2, wireType 2 =*/18).string(message.columns[i]);
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     writer.uint32(/* id 3, wireType 0 =*/24).bool(message.unique);
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    writer.uint32(/* id 4, wireType 2 =*/34).string(message.type);
                 return writer;
             };
 
@@ -16965,6 +17027,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                             message.unique = reader.bool();
                             break;
                         }
+                    case 4: {
+                            message.type = reader.string();
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7, long);
                         break;
@@ -17017,6 +17083,9 @@ const sqlanvil = $root.sqlanvil = (() => {
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     if (typeof message.unique !== "boolean")
                         return "unique: boolean expected";
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    if (!$util.isString(message.type))
+                        return "type: string expected";
                 return null;
             };
 
@@ -17049,6 +17118,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 }
                 if (object.unique != null)
                     message.unique = Boolean(object.unique);
+                if (object.type != null)
+                    message.type = String(object.type);
                 return message;
             };
 
@@ -17074,6 +17145,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 if (options.defaults) {
                     object.name = "";
                     object.unique = false;
+                    object.type = "";
                 }
                 if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                     object.name = message.name;
@@ -17084,6 +17156,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 }
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     object.unique = message.unique;
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    object.type = message.type;
                 return object;
             };
 
@@ -48342,6 +48416,9 @@ class MysqlExecutionSql {
         if (opts.collation) {
             suffix += ` collate=${opts.collation}`;
         }
+        if (opts.rowFormat) {
+            suffix += ` row_format=${opts.rowFormat}`;
+        }
         return suffix;
     }
     createIndexes(table) {
@@ -48352,12 +48429,28 @@ class MysqlExecutionSql {
         }
         const target = this.resolveTarget(table.target);
         return indexes.map(index => {
-            const unique = index.unique ? "unique " : "";
-            const cols = (index.columns || []).map(c => `\`${c}\``).join(", ");
-            const name = index.name || this.defaultIndexName(table.target.name, index.columns, !!index.unique);
-            return `alter table ${target} add ${unique}index \`${name}\` (${cols})`;
+            const kind = (index.type || "").toLowerCase();
+            if (kind && kind !== "fulltext" && kind !== "spatial") {
+                throw new Error(`mysql index type must be "fulltext" or "spatial" (or omitted); got "${index.type}".`);
+            }
+            if (kind && index.unique) {
+                throw new Error(`a mysql ${kind} index cannot also be unique.`);
+            }
+            const prefix = index.unique ? "unique " : kind ? `${kind} ` : "";
+            const cols = (index.columns || []).map(c => this.indexColumnSql(c)).join(", ");
+            const bareColumns = (index.columns || []).map(c => this.indexColumnName(c));
+            const name = index.name || this.defaultIndexName(table.target.name, bareColumns, !!index.unique);
+            return `alter table ${target} add ${prefix}index \`${name}\` (${cols})`;
         });
     }
+    indexColumnSql(column) {
+        const m = /^(.*?)\((\d+)\)$/.exec(column.trim());
+        return m ? `\`${m[1].trim()}\`(${m[2]})` : `\`${column}\``;
+    }
+    indexColumnName(column) {
+        const m = /^(.*?)\((\d+)\)$/.exec(column.trim());
+        return m ? m[1].trim() : column;
+    }
     defaultIndexName(tableName, columns, unique) {
         const parts = [tableName, ...(columns || [])].filter(Boolean);
         const suffix = unique ? "_key" : "_idx";
@@ -48797,7 +48890,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.18.0";
+const version = "1.19.0";
 const dataformVersion = "3.0.61";
 
 async function build(compiledGraph, runConfig, dbadapter) {

package/package.json

@@ -64,7 +64,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.18.0",
+    "version": "1.19.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -5826,6 +5826,7 @@ const sqlanvil = $root.sqlanvil = (() => {
              * @property {sqlanvil.ActionConfig.IMetadata|null} [metadata] ViewConfig metadata
              * @property {string|null} [reservation] ViewConfig reservation
              * @property {sqlanvil.IPostgresOptions|null} [postgres] ViewConfig postgres
+             * @property {sqlanvil.IMysqlOptions|null} [mysql] ViewConfig mysql
              */
 
             /**
@@ -6027,6 +6028,14 @@ const sqlanvil = $root.sqlanvil = (() => {
              */
             ViewConfig.prototype.postgres = null;
 
+            /**
+             * ViewConfig mysql.
+             * @member {sqlanvil.IMysqlOptions|null|undefined} mysql
+             * @memberof sqlanvil.ActionConfig.ViewConfig
+             * @instance
+             */
+            ViewConfig.prototype.mysql = null;
+
             /**
              * Creates a new ViewConfig instance using the specified properties.
              * @function create
@@ -6107,6 +6116,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     writer.uint32(/* id 21, wireType 2 =*/170).string(message.reservation);
                 if (message.postgres != null && Object.hasOwnProperty.call(message, "postgres"))
                     $root.sqlanvil.PostgresOptions.encode(message.postgres, writer.uint32(/* id 22, wireType 2 =*/178).fork(), q + 1).ldelim();
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql"))
+                    $root.sqlanvil.MysqlOptions.encode(message.mysql, writer.uint32(/* id 23, wireType 2 =*/186).fork(), q + 1).ldelim();
                 return writer;
             };
 
@@ -6289,6 +6300,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                             message.postgres = $root.sqlanvil.PostgresOptions.decode(reader, reader.uint32(), undefined, long + 1);
                             break;
                         }
+                    case 23: {
+                            message.mysql = $root.sqlanvil.MysqlOptions.decode(reader, reader.uint32(), undefined, long + 1);
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7, long);
                         break;
@@ -6438,6 +6453,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                     if (error)
                         return "postgres." + error;
                 }
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql")) {
+                    let error = $root.sqlanvil.MysqlOptions.verify(message.mysql, long + 1);
+                    if (error)
+                        return "mysql." + error;
+                }
                 return null;
             };
 
@@ -6564,6 +6584,11 @@ const sqlanvil = $root.sqlanvil = (() => {
                         throw TypeError(".sqlanvil.ActionConfig.ViewConfig.postgres: object expected");
                     message.postgres = $root.sqlanvil.PostgresOptions.fromObject(object.postgres, long + 1);
                 }
+                if (object.mysql != null) {
+                    if (!$util.isObject(object.mysql))
+                        throw TypeError(".sqlanvil.ActionConfig.ViewConfig.mysql: object expected");
+                    message.mysql = $root.sqlanvil.MysqlOptions.fromObject(object.mysql, long + 1);
+                }
                 return message;
             };
 
@@ -6611,6 +6636,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                     object.metadata = null;
                     object.reservation = "";
                     object.postgres = null;
+                    object.mysql = null;
                 }
                 if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                     object.name = message.name;
@@ -6687,6 +6713,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     object.reservation = message.reservation;
                 if (message.postgres != null && Object.hasOwnProperty.call(message, "postgres"))
                     object.postgres = $root.sqlanvil.PostgresOptions.toObject(message.postgres, options, q + 1);
+                if (message.mysql != null && Object.hasOwnProperty.call(message, "mysql"))
+                    object.mysql = $root.sqlanvil.MysqlOptions.toObject(message.mysql, options, q + 1);
                 return object;
             };
 
@@ -16428,6 +16456,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [engine] MysqlOptions engine
          * @property {string|null} [charset] MysqlOptions charset
          * @property {string|null} [collation] MysqlOptions collation
+         * @property {string|null} [rowFormat] MysqlOptions rowFormat
          * @property {Array.<sqlanvil.MysqlOptions.IIndex>|null} [indexes] MysqlOptions indexes
          * @property {sqlanvil.MysqlOptions.IPartition|null} [partition] MysqlOptions partition
          */
@@ -16472,6 +16501,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         MysqlOptions.prototype.collation = "";
 
+        /**
+         * MysqlOptions rowFormat.
+         * @member {string} rowFormat
+         * @memberof sqlanvil.MysqlOptions
+         * @instance
+         */
+        MysqlOptions.prototype.rowFormat = "";
+
         /**
          * MysqlOptions indexes.
          * @member {Array.<sqlanvil.MysqlOptions.IIndex>} indexes
@@ -16527,6 +16564,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                     $root.sqlanvil.MysqlOptions.Index.encode(message.indexes[i], writer.uint32(/* id 4, wireType 2 =*/34).fork(), q + 1).ldelim();
             if (message.partition != null && Object.hasOwnProperty.call(message, "partition"))
                 $root.sqlanvil.MysqlOptions.Partition.encode(message.partition, writer.uint32(/* id 5, wireType 2 =*/42).fork(), q + 1).ldelim();
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                writer.uint32(/* id 6, wireType 2 =*/50).string(message.rowFormat);
             return writer;
         };
 
@@ -16579,6 +16618,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.collation = reader.string();
                         break;
                     }
+                case 6: {
+                        message.rowFormat = reader.string();
+                        break;
+                    }
                 case 4: {
                         if (!(message.indexes && message.indexes.length))
                             message.indexes = [];
@@ -16637,6 +16680,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.collation != null && Object.hasOwnProperty.call(message, "collation"))
                 if (!$util.isString(message.collation))
                     return "collation: string expected";
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                if (!$util.isString(message.rowFormat))
+                    return "rowFormat: string expected";
             if (message.indexes != null && Object.hasOwnProperty.call(message, "indexes")) {
                 if (!Array.isArray(message.indexes))
                     return "indexes: array expected";
@@ -16678,6 +16724,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.charset = String(object.charset);
             if (object.collation != null)
                 message.collation = String(object.collation);
+            if (object.rowFormat != null)
+                message.rowFormat = String(object.rowFormat);
             if (object.indexes) {
                 if (!Array.isArray(object.indexes))
                     throw TypeError(".sqlanvil.MysqlOptions.indexes: array expected");
@@ -16720,6 +16768,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.charset = "";
                 object.collation = "";
                 object.partition = null;
+                object.rowFormat = "";
             }
             if (message.engine != null && Object.hasOwnProperty.call(message, "engine"))
                 object.engine = message.engine;
@@ -16734,6 +16783,8 @@ const sqlanvil = $root.sqlanvil = (() => {
             }
             if (message.partition != null && Object.hasOwnProperty.call(message, "partition"))
                 object.partition = $root.sqlanvil.MysqlOptions.Partition.toObject(message.partition, options, q + 1);
+            if (message.rowFormat != null && Object.hasOwnProperty.call(message, "rowFormat"))
+                object.rowFormat = message.rowFormat;
             return object;
         };
 
@@ -16772,6 +16823,7 @@ const sqlanvil = $root.sqlanvil = (() => {
              * @property {string|null} [name] Index name
              * @property {Array.<string>|null} [columns] Index columns
              * @property {boolean|null} [unique] Index unique
+             * @property {string|null} [type] Index type
              */
 
             /**
@@ -16814,6 +16866,14 @@ const sqlanvil = $root.sqlanvil = (() => {
              */
             Index.prototype.unique = false;
 
+            /**
+             * Index type.
+             * @member {string} type
+             * @memberof sqlanvil.MysqlOptions.Index
+             * @instance
+             */
+            Index.prototype.type = "";
+
             /**
              * Creates a new Index instance using the specified properties.
              * @function create
@@ -16849,6 +16909,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                         writer.uint32(/* id 2, wireType 2 =*/18).string(message.columns[i]);
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     writer.uint32(/* id 3, wireType 0 =*/24).bool(message.unique);
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    writer.uint32(/* id 4, wireType 2 =*/34).string(message.type);
                 return writer;
             };
 
@@ -16903,6 +16965,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                             message.unique = reader.bool();
                             break;
                         }
+                    case 4: {
+                            message.type = reader.string();
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7, long);
                         break;
@@ -16955,6 +17021,9 @@ const sqlanvil = $root.sqlanvil = (() => {
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     if (typeof message.unique !== "boolean")
                         return "unique: boolean expected";
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    if (!$util.isString(message.type))
+                        return "type: string expected";
                 return null;
             };
 
@@ -16987,6 +17056,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 }
                 if (object.unique != null)
                     message.unique = Boolean(object.unique);
+                if (object.type != null)
+                    message.type = String(object.type);
                 return message;
             };
 
@@ -17012,6 +17083,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 if (options.defaults) {
                     object.name = "";
                     object.unique = false;
+                    object.type = "";
                 }
                 if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                     object.name = message.name;
@@ -17022,6 +17094,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 }
                 if (message.unique != null && Object.hasOwnProperty.call(message, "unique"))
                     object.unique = message.unique;
+                if (message.type != null && Object.hasOwnProperty.call(message, "type"))
+                    object.type = message.type;
                 return object;
             };