velocious 1.0.185 → 1.0.186

package/build/src/database/drivers/sqlite/structure-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structure-sql.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/structure-sql.js"],"names":[],"mappings":"AAIA;IACE;;;OAGG;IACH,wBAFG;QAA2C,MAAM,EAAzC,OAAO,YAAY,EAAE,OAAO;KACtC,EAGA;IADC,qCAAoB;IAGtB;;OAEG;IACH,SAFa,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAclC;CACF"}
+{"version":3,"file":"structure-sql.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/structure-sql.js"],"names":[],"mappings":"AAIA;IACE;;;OAGG;IACH,wBAFG;QAA2C,MAAM,EAAzC,OAAO,YAAY,EAAE,OAAO;KACtC,EAGA;IADC,qCAAoB;IAGtB;;OAEG;IACH,SAFa,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsClC;CACF"}

package/build/src/database/drivers/sqlite/structure-sql.js

@@ -13,15 +13,39 @@ export default class VelociousDatabaseDriversSqliteStructureSql {
      */
     async toSql() {
         const { driver } = this;
-        const rows = await driver.query("SELECT sql FROM sqlite_master WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%' ORDER BY type, name");
-        const statements = rows
-            .map((row) => String(row.sql))
-            .filter((statement) => Boolean(statement))
-            .map((statement) => normalizeSqlStatement(statement))
-            .filter((statement) => Boolean(statement));
+        const rows = await driver.query("SELECT type, sql, name FROM sqlite_master WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%' ORDER BY name");
+        const tables = [];
+        const views = [];
+        const indexes = [];
+        const triggers = [];
+        const others = [];
+        for (const row of rows) {
+            const rawSql = row.sql || row.SQL;
+            const rawType = row.type || row.TYPE;
+            const statement = rawSql ? normalizeSqlStatement(String(rawSql)) : "";
+            if (!statement)
+                continue;
+            const normalizedType = rawType ? String(rawType).toLowerCase() : "";
+            if (normalizedType === "table") {
+                tables.push(statement);
+            }
+            else if (normalizedType === "view") {
+                views.push(statement);
+            }
+            else if (normalizedType === "index") {
+                indexes.push(statement);
+            }
+            else if (normalizedType === "trigger") {
+                triggers.push(statement);
+            }
+            else {
+                others.push(statement);
+            }
+        }
+        const statements = [...tables, ...views, ...indexes, ...triggers, ...others];
         if (statements.length == 0)
             return null;
         return `${statements.join("\n\n")}\n`;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RydWN0dXJlLXNxbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9kYXRhYmFzZS9kcml2ZXJzL3NxbGl0ZS9zdHJ1Y3R1cmUtc3FsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFlBQVk7QUFFWixPQUFPLEVBQUMscUJBQXFCLEVBQUMsTUFBTSwyQkFBMkIsQ0FBQTtBQUUvRCxNQUFNLENBQUMsT0FBTyxPQUFPLDBDQUEwQztJQUM3RDs7O09BR0c7SUFDSCxZQUFZLEVBQUMsTUFBTSxFQUFDO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO0lBQ3RCLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxLQUFLO1FBQ1QsTUFBTSxFQUFDLE1BQU0sRUFBQyxHQUFHLElBQUksQ0FBQTtRQUNyQixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsc0dBQXNHLENBQUMsQ0FBQTtRQUN2SSxNQUFNLFVBQVUsR0FBRyxJQUFJO2FBQ3BCLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUM3QixNQUFNLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUN6QyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLHFCQUFxQixDQUFDLFNBQVMsQ0FBQyxDQUFDO2FBQ3BELE1BQU0sQ0FBQyxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFFNUMsSUFBSSxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUM7WUFBRSxPQUFPLElBQUksQ0FBQTtRQUV2QyxPQUFPLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFBO0lBQ3ZDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8vIEB0cy1jaGVja1xuXG5pbXBvcnQge25vcm1hbGl6ZVNxbFN0YXRlbWVudH0gZnJvbSBcIi4uL3N0cnVjdHVyZS1zcWwvdXRpbHMuanNcIlxuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWZWxvY2lvdXNEYXRhYmFzZURyaXZlcnNTcWxpdGVTdHJ1Y3R1cmVTcWwge1xuICAvKipcbiAgICogQHBhcmFtIHtvYmplY3R9IGFyZ3MgLSBPcHRpb25zIG9iamVjdC5cbiAgICogQHBhcmFtIHtpbXBvcnQoXCIuLi9iYXNlLmpzXCIpLmRlZmF1bHR9IGFyZ3MuZHJpdmVyIC0gRGF0YWJhc2UgZHJpdmVyIGluc3RhbmNlLlxuICAgKi9cbiAgY29uc3RydWN0b3Ioe2RyaXZlcn0pIHtcbiAgICB0aGlzLmRyaXZlciA9IGRyaXZlclxuICB9XG5cbiAgLyoqXG4gICAqIEByZXR1cm5zIHtQcm9taXNlPHN0cmluZyB8IG51bGw+fSAtIFJlc29sdmVzIHdpdGggU1FMIHN0cmluZy5cbiAgICovXG4gIGFzeW5jIHRvU3FsKCkge1xuICAgIGNvbnN0IHtkcml2ZXJ9ID0gdGhpc1xuICAgIGNvbnN0IHJvd3MgPSBhd2FpdCBkcml2ZXIucXVlcnkoXCJTRUxFQ1Qgc3FsIEZST00gc3FsaXRlX21hc3RlciBXSEVSRSBzcWwgSVMgTk9UIE5VTEwgQU5EIG5hbWUgTk9UIExJS0UgJ3NxbGl0ZV8lJyBPUkRFUiBCWSB0eXBlLCBuYW1lXCIpXG4gICAgY29uc3Qgc3RhdGVtZW50cyA9IHJvd3NcbiAgICAgIC5tYXAoKHJvdykgPT4gU3RyaW5nKHJvdy5zcWwpKVxuICAgICAgLmZpbHRlcigoc3RhdGVtZW50KSA9PiBCb29sZWFuKHN0YXRlbWVudCkpXG4gICAgICAubWFwKChzdGF0ZW1lbnQpID0+IG5vcm1hbGl6ZVNxbFN0YXRlbWVudChzdGF0ZW1lbnQpKVxuICAgICAgLmZpbHRlcigoc3RhdGVtZW50KSA9PiBCb29sZWFuKHN0YXRlbWVudCkpXG5cbiAgICBpZiAoc3RhdGVtZW50cy5sZW5ndGggPT0gMCkgcmV0dXJuIG51bGxcblxuICAgIHJldHVybiBgJHtzdGF0ZW1lbnRzLmpvaW4oXCJcXG5cXG5cIil9XFxuYFxuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RydWN0dXJlLXNxbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9kYXRhYmFzZS9kcml2ZXJzL3NxbGl0ZS9zdHJ1Y3R1cmUtc3FsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFlBQVk7QUFFWixPQUFPLEVBQUMscUJBQXFCLEVBQUMsTUFBTSwyQkFBMkIsQ0FBQTtBQUUvRCxNQUFNLENBQUMsT0FBTyxPQUFPLDBDQUEwQztJQUM3RDs7O09BR0c7SUFDSCxZQUFZLEVBQUMsTUFBTSxFQUFDO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO0lBQ3RCLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxLQUFLO1FBQ1QsTUFBTSxFQUFDLE1BQU0sRUFBQyxHQUFHLElBQUksQ0FBQTtRQUNyQixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsNEdBQTRHLENBQUMsQ0FBQTtRQUM3SSxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDakIsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFBO1FBQ2hCLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNsQixNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUE7UUFDbkIsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFBO1FBRWpCLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7WUFDdkIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFBO1lBQ2pDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQTtZQUNwQyxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7WUFFckUsSUFBSSxDQUFDLFNBQVM7Z0JBQUUsU0FBUTtZQUV4QixNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO1lBRW5FLElBQUksY0FBYyxLQUFLLE9BQU8sRUFBRSxDQUFDO2dCQUMvQixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hCLENBQUM7aUJBQU0sSUFBSSxjQUFjLEtBQUssTUFBTSxFQUFFLENBQUM7Z0JBQ3JDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7WUFDdkIsQ0FBQztpQkFBTSxJQUFJLGNBQWMsS0FBSyxPQUFPLEVBQUUsQ0FBQztnQkFDdEMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtZQUN6QixDQUFDO2lCQUFNLElBQUksY0FBYyxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN4QyxRQUFRLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQzFCLENBQUM7aUJBQU0sQ0FBQztnQkFDTixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hCLENBQUM7UUFDSCxDQUFDO1FBRUQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxHQUFHLE1BQU0sRUFBRSxHQUFHLEtBQUssRUFBRSxHQUFHLE9BQU8sRUFBRSxHQUFHLFFBQVEsRUFBRSxHQUFHLE1BQU0sQ0FBQyxDQUFBO1FBRTVFLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDO1lBQUUsT0FBTyxJQUFJLENBQUE7UUFFdkMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQTtJQUN2QyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBAdHMtY2hlY2tcblxuaW1wb3J0IHtub3JtYWxpemVTcWxTdGF0ZW1lbnR9IGZyb20gXCIuLi9zdHJ1Y3R1cmUtc3FsL3V0aWxzLmpzXCJcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVmVsb2Npb3VzRGF0YWJhc2VEcml2ZXJzU3FsaXRlU3RydWN0dXJlU3FsIHtcbiAgLyoqXG4gICAqIEBwYXJhbSB7b2JqZWN0fSBhcmdzIC0gT3B0aW9ucyBvYmplY3QuXG4gICAqIEBwYXJhbSB7aW1wb3J0KFwiLi4vYmFzZS5qc1wiKS5kZWZhdWx0fSBhcmdzLmRyaXZlciAtIERhdGFiYXNlIGRyaXZlciBpbnN0YW5jZS5cbiAgICovXG4gIGNvbnN0cnVjdG9yKHtkcml2ZXJ9KSB7XG4gICAgdGhpcy5kcml2ZXIgPSBkcml2ZXJcbiAgfVxuXG4gIC8qKlxuICAgKiBAcmV0dXJucyB7UHJvbWlzZTxzdHJpbmcgfCBudWxsPn0gLSBSZXNvbHZlcyB3aXRoIFNRTCBzdHJpbmcuXG4gICAqL1xuICBhc3luYyB0b1NxbCgpIHtcbiAgICBjb25zdCB7ZHJpdmVyfSA9IHRoaXNcbiAgICBjb25zdCByb3dzID0gYXdhaXQgZHJpdmVyLnF1ZXJ5KFwiU0VMRUNUIHR5cGUsIHNxbCwgbmFtZSBGUk9NIHNxbGl0ZV9tYXN0ZXIgV0hFUkUgc3FsIElTIE5PVCBOVUxMIEFORCBuYW1lIE5PVCBMSUtFICdzcWxpdGVfJScgT1JERVIgQlkgbmFtZVwiKVxuICAgIGNvbnN0IHRhYmxlcyA9IFtdXG4gICAgY29uc3Qgdmlld3MgPSBbXVxuICAgIGNvbnN0IGluZGV4ZXMgPSBbXVxuICAgIGNvbnN0IHRyaWdnZXJzID0gW11cbiAgICBjb25zdCBvdGhlcnMgPSBbXVxuXG4gICAgZm9yIChjb25zdCByb3cgb2Ygcm93cykge1xuICAgICAgY29uc3QgcmF3U3FsID0gcm93LnNxbCB8fCByb3cuU1FMXG4gICAgICBjb25zdCByYXdUeXBlID0gcm93LnR5cGUgfHwgcm93LlRZUEVcbiAgICAgIGNvbnN0IHN0YXRlbWVudCA9IHJhd1NxbCA/IG5vcm1hbGl6ZVNxbFN0YXRlbWVudChTdHJpbmcocmF3U3FsKSkgOiBcIlwiXG5cbiAgICAgIGlmICghc3RhdGVtZW50KSBjb250aW51ZVxuXG4gICAgICBjb25zdCBub3JtYWxpemVkVHlwZSA9IHJhd1R5cGUgPyBTdHJpbmcocmF3VHlwZSkudG9Mb3dlckNhc2UoKSA6IFwiXCJcblxuICAgICAgaWYgKG5vcm1hbGl6ZWRUeXBlID09PSBcInRhYmxlXCIpIHtcbiAgICAgICAgdGFibGVzLnB1c2goc3RhdGVtZW50KVxuICAgICAgfSBlbHNlIGlmIChub3JtYWxpemVkVHlwZSA9PT0gXCJ2aWV3XCIpIHtcbiAgICAgICAgdmlld3MucHVzaChzdGF0ZW1lbnQpXG4gICAgICB9IGVsc2UgaWYgKG5vcm1hbGl6ZWRUeXBlID09PSBcImluZGV4XCIpIHtcbiAgICAgICAgaW5kZXhlcy5wdXNoKHN0YXRlbWVudClcbiAgICAgIH0gZWxzZSBpZiAobm9ybWFsaXplZFR5cGUgPT09IFwidHJpZ2dlclwiKSB7XG4gICAgICAgIHRyaWdnZXJzLnB1c2goc3RhdGVtZW50KVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgb3RoZXJzLnB1c2goc3RhdGVtZW50KVxuICAgICAgfVxuICAgIH1cblxuICAgIGNvbnN0IHN0YXRlbWVudHMgPSBbLi4udGFibGVzLCAuLi52aWV3cywgLi4uaW5kZXhlcywgLi4udHJpZ2dlcnMsIC4uLm90aGVyc11cblxuICAgIGlmIChzdGF0ZW1lbnRzLmxlbmd0aCA9PSAwKSByZXR1cm4gbnVsbFxuXG4gICAgcmV0dXJuIGAke3N0YXRlbWVudHMuam9pbihcIlxcblxcblwiKX1cXG5gXG4gIH1cbn1cbiJdfQ==

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.185",
+  "version": "1.0.186",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [