velocious 1.0.504 → 1.0.505
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -52,6 +52,23 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
52
52
|
const targetTableData = this.targetTableData
|
|
53
53
|
const previousTargetName = targetTableData.getName()
|
|
54
54
|
|
|
55
|
+
// Column-level `index: true` indexes are named after the table they are created with, and
|
|
56
|
+
// ALTER TABLE ... RENAME does not rename indexes - creating them inside the temp table's
|
|
57
|
+
// CREATE would leak the temp rebuild name permanently. Strip the flags for the temp CREATE
|
|
58
|
+
// and create those indexes explicitly on the temp table with their FINAL names BEFORE the
|
|
59
|
+
// copy: index names are database-global and survive the rename, and a violation (e.g. a new
|
|
60
|
+
// unique index over rows that all receive the same default) fails during INSERT...SELECT,
|
|
61
|
+
// while the original table still exists - never after the swap.
|
|
62
|
+
/** @type {Array<{column: import("../../table-data/table-column.js").default, index: ?, indexArgs: ?}>} */
|
|
63
|
+
const strippedColumnIndexes = []
|
|
64
|
+
|
|
65
|
+
for (const column of targetTableData.getColumns()) {
|
|
66
|
+
if (!column.getIndex()) continue
|
|
67
|
+
|
|
68
|
+
strippedColumnIndexes.push({column, index: column.getIndex(), indexArgs: column.getIndexArgs()})
|
|
69
|
+
column.setIndex(false)
|
|
70
|
+
}
|
|
71
|
+
|
|
55
72
|
targetTableData.setName(tempTableName)
|
|
56
73
|
|
|
57
74
|
let createTableSQLs
|
|
@@ -60,6 +77,8 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
60
77
|
createTableSQLs = await driver.createTableSql(targetTableData)
|
|
61
78
|
} finally {
|
|
62
79
|
targetTableData.setName(previousTargetName)
|
|
80
|
+
|
|
81
|
+
for (const {column, index} of strippedColumnIndexes) column.setIndex(index)
|
|
63
82
|
}
|
|
64
83
|
|
|
65
84
|
const newColumnsSQL = this.columnPairs.map(([, newName]) => options.quoteColumnName(newName)).join(", ")
|
|
@@ -69,6 +88,22 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
69
88
|
|
|
70
89
|
for (const sql of createTableSQLs) sqls.push(sql)
|
|
71
90
|
|
|
91
|
+
for (const {column, indexArgs} of strippedColumnIndexes) {
|
|
92
|
+
const {unique, ...restIndexArgs} = indexArgs || {}
|
|
93
|
+
|
|
94
|
+
restArgsError(restIndexArgs)
|
|
95
|
+
|
|
96
|
+
const createIndexSQLs = await new CreateIndexBase({
|
|
97
|
+
columns: [column.getName()],
|
|
98
|
+
driver,
|
|
99
|
+
name: `index_on_${originalTableName}_${column.getName()}`,
|
|
100
|
+
tableName: tempTableName,
|
|
101
|
+
unique
|
|
102
|
+
}).toSQLs()
|
|
103
|
+
|
|
104
|
+
for (const sql of createIndexSQLs) sqls.push(sql)
|
|
105
|
+
}
|
|
106
|
+
|
|
72
107
|
if (this.columnPairs.length > 0) {
|
|
73
108
|
sqls.push(
|
|
74
109
|
`INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-rebuilder.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/table-rebuilder.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;GAeG;AACH;IACE;;;;;;;OAOG;IACH,sFALG;QAA2C,MAAM,EAAzC,OAAO,YAAY,EAAE,OAAO;QACf,iBAAiB,EAA9B,MAAM;QACU,eAAe,EAA/B,SAAS;QACqB,WAAW,EAAzC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC,EAUA;IAJC,qCAAoB;IACpB,0BAA0C;IAC1C,2BAAsC;IACtC,gCAA8B;IAGhC;;;OAGG;IACH,UAFa,OAAO,CAAC,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"table-rebuilder.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/table-rebuilder.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;GAeG;AACH;IACE;;;;;;;OAOG;IACH,sFALG;QAA2C,MAAM,EAAzC,OAAO,YAAY,EAAE,OAAO;QACf,iBAAiB,EAA9B,MAAM;QACU,eAAe,EAA/B,SAAS;QACqB,WAAW,EAAzC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC,EAUA;IAJC,qCAAoB;IACpB,0BAA0C;IAC1C,2BAAsC;IACtC,gCAA8B;IAGhC;;;OAGG;IACH,UAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAqF7B;CACF;sBA9HqB,2BAA2B"}
|
|
@@ -47,6 +47,21 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
47
47
|
const tempTableName = `${originalTableName}_velocious_rebuild`;
|
|
48
48
|
const targetTableData = this.targetTableData;
|
|
49
49
|
const previousTargetName = targetTableData.getName();
|
|
50
|
+
// Column-level `index: true` indexes are named after the table they are created with, and
|
|
51
|
+
// ALTER TABLE ... RENAME does not rename indexes - creating them inside the temp table's
|
|
52
|
+
// CREATE would leak the temp rebuild name permanently. Strip the flags for the temp CREATE
|
|
53
|
+
// and create those indexes explicitly on the temp table with their FINAL names BEFORE the
|
|
54
|
+
// copy: index names are database-global and survive the rename, and a violation (e.g. a new
|
|
55
|
+
// unique index over rows that all receive the same default) fails during INSERT...SELECT,
|
|
56
|
+
// while the original table still exists - never after the swap.
|
|
57
|
+
/** @type {Array<{column: import("../../table-data/table-column.js").default, index: ?, indexArgs: ?}>} */
|
|
58
|
+
const strippedColumnIndexes = [];
|
|
59
|
+
for (const column of targetTableData.getColumns()) {
|
|
60
|
+
if (!column.getIndex())
|
|
61
|
+
continue;
|
|
62
|
+
strippedColumnIndexes.push({ column, index: column.getIndex(), indexArgs: column.getIndexArgs() });
|
|
63
|
+
column.setIndex(false);
|
|
64
|
+
}
|
|
50
65
|
targetTableData.setName(tempTableName);
|
|
51
66
|
let createTableSQLs;
|
|
52
67
|
try {
|
|
@@ -54,12 +69,27 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
54
69
|
}
|
|
55
70
|
finally {
|
|
56
71
|
targetTableData.setName(previousTargetName);
|
|
72
|
+
for (const { column, index } of strippedColumnIndexes)
|
|
73
|
+
column.setIndex(index);
|
|
57
74
|
}
|
|
58
75
|
const newColumnsSQL = this.columnPairs.map(([, newName]) => options.quoteColumnName(newName)).join(", ");
|
|
59
76
|
const oldColumnsSQL = this.columnPairs.map(([oldName]) => options.quoteColumnName(oldName)).join(", ");
|
|
60
77
|
const sqls = [];
|
|
61
78
|
for (const sql of createTableSQLs)
|
|
62
79
|
sqls.push(sql);
|
|
80
|
+
for (const { column, indexArgs } of strippedColumnIndexes) {
|
|
81
|
+
const { unique, ...restIndexArgs } = indexArgs || {};
|
|
82
|
+
restArgsError(restIndexArgs);
|
|
83
|
+
const createIndexSQLs = await new CreateIndexBase({
|
|
84
|
+
columns: [column.getName()],
|
|
85
|
+
driver,
|
|
86
|
+
name: `index_on_${originalTableName}_${column.getName()}`,
|
|
87
|
+
tableName: tempTableName,
|
|
88
|
+
unique
|
|
89
|
+
}).toSQLs();
|
|
90
|
+
for (const sql of createIndexSQLs)
|
|
91
|
+
sqls.push(sql);
|
|
92
|
+
}
|
|
63
93
|
if (this.columnPairs.length > 0) {
|
|
64
94
|
sqls.push(`INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) ` +
|
|
65
95
|
`SELECT ${oldColumnsSQL} FROM ${options.quoteTableName(originalTableName)}`);
|
|
@@ -80,4 +110,4 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
80
110
|
return sqls;
|
|
81
111
|
}
|
|
82
112
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"table-rebuilder.js","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/table-rebuilder.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport CreateIndexBase from \"../../query/create-index-base.js\"\nimport restArgsError from \"../../../utils/rest-args-error.js\"\nimport TableData from \"../../table-data/index.js\"\n\n/**\n * Emits the SQL sequence for SQLite's \"rebuild\" approach to schema changes.\n *\n * SQLite cannot add/drop foreign-key constraints, drop columns on older\n * versions, change column types, or add CHECK constraints via ALTER TABLE.\n * The standard workaround (https://sqlite.org/lang_altertable.html) is to\n * create a new table with the desired schema, copy rows over, drop the\n * original, and rename the replacement.\n *\n * Caller passes the desired final schema; this class handles the mechanical\n * sequence (CREATE temp / INSERT...SELECT / DROP / RENAME / recreate\n * indexes). Caller is responsible for any FK toggling or transaction setup\n * around the returned SQL — `PRAGMA foreign_keys` is connection-scoped and\n * cannot be flipped inside a transaction, so wrapping policy is left to the\n * caller (see `sql/alter-table.js`).\n */\nexport default class VelociousDatabaseDriversSqliteTableRebuilder {\n  /**\n   * Runs constructor.\n   * @param {object} args - Options object.\n   * @param {import(\"../base.js\").default} args.driver - Database driver instance.\n   * @param {string} args.originalTableName - Name of the existing table to rebuild.\n   * @param {TableData} args.targetTableData - Desired final schema (columns + foreign keys + indexes). The instance's name is overwritten internally during emission.\n   * @param {Array<[string, string]>} args.columnPairs - Pairs of [oldColumnName, newColumnName] describing how rows from the original table should populate the rebuilt table.\n   */\n  constructor({driver, originalTableName, targetTableData, columnPairs, ...restArgs}) {\n    restArgsError(restArgs)\n\n    if (!(targetTableData instanceof TableData)) throw new Error(\"Invalid target table data was given\")\n\n    this.driver = driver\n    this.originalTableName = originalTableName\n    this.targetTableData = targetTableData\n    this.columnPairs = columnPairs\n  }\n\n  /**\n   * Runs to sqls.\n   * @returns {Promise<string[]>} - Resolves with SQL statements to execute in order.\n   */\n  async toSQLs() {\n    const driver = this.driver\n    const options = driver.options()\n    const originalTableName = this.originalTableName\n    const tempTableName = `${originalTableName}_velocious_rebuild`\n    const targetTableData = this.targetTableData\n    const previousTargetName = targetTableData.getName()\n\n    targetTableData.setName(tempTableName)\n\n    let createTableSQLs\n\n    try {\n      createTableSQLs = await driver.createTableSql(targetTableData)\n    } finally {\n      targetTableData.setName(previousTargetName)\n    }\n\n    const newColumnsSQL = this.columnPairs.map(([, newName]) => options.quoteColumnName(newName)).join(\", \")\n    const oldColumnsSQL = this.columnPairs.map(([oldName]) => options.quoteColumnName(oldName)).join(\", \")\n\n    const sqls = []\n\n    for (const sql of createTableSQLs) sqls.push(sql)\n\n    if (this.columnPairs.length > 0) {\n      sqls.push(\n        `INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) ` +\n        `SELECT ${oldColumnsSQL} FROM ${options.quoteTableName(originalTableName)}`\n      )\n    }\n\n    sqls.push(`DROP TABLE ${options.quoteTableName(originalTableName)}`)\n    sqls.push(`ALTER TABLE ${options.quoteTableName(tempTableName)} RENAME TO ${options.quoteTableName(originalTableName)}`)\n\n    for (const tableDataIndex of targetTableData.getIndexes()) {\n      const createIndexSQLs = await new CreateIndexBase({\n        columns: tableDataIndex.getColumns(),\n        driver,\n        name: tableDataIndex.getName(),\n        tableName: originalTableName,\n        unique: tableDataIndex.getUnique()\n      }).toSQLs()\n\n      for (const sql of createIndexSQLs) sqls.push(sql)\n    }\n\n    return sqls\n  }\n}\n"]}
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"table-rebuilder.js","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/table-rebuilder.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport CreateIndexBase from \"../../query/create-index-base.js\"\nimport restArgsError from \"../../../utils/rest-args-error.js\"\nimport TableData from \"../../table-data/index.js\"\n\n/**\n * Emits the SQL sequence for SQLite's \"rebuild\" approach to schema changes.\n *\n * SQLite cannot add/drop foreign-key constraints, drop columns on older\n * versions, change column types, or add CHECK constraints via ALTER TABLE.\n * The standard workaround (https://sqlite.org/lang_altertable.html) is to\n * create a new table with the desired schema, copy rows over, drop the\n * original, and rename the replacement.\n *\n * Caller passes the desired final schema; this class handles the mechanical\n * sequence (CREATE temp / INSERT...SELECT / DROP / RENAME / recreate\n * indexes). Caller is responsible for any FK toggling or transaction setup\n * around the returned SQL — `PRAGMA foreign_keys` is connection-scoped and\n * cannot be flipped inside a transaction, so wrapping policy is left to the\n * caller (see `sql/alter-table.js`).\n */\nexport default class VelociousDatabaseDriversSqliteTableRebuilder {\n  /**\n   * Runs constructor.\n   * @param {object} args - Options object.\n   * @param {import(\"../base.js\").default} args.driver - Database driver instance.\n   * @param {string} args.originalTableName - Name of the existing table to rebuild.\n   * @param {TableData} args.targetTableData - Desired final schema (columns + foreign keys + indexes). The instance's name is overwritten internally during emission.\n   * @param {Array<[string, string]>} args.columnPairs - Pairs of [oldColumnName, newColumnName] describing how rows from the original table should populate the rebuilt table.\n   */\n  constructor({driver, originalTableName, targetTableData, columnPairs, ...restArgs}) {\n    restArgsError(restArgs)\n\n    if (!(targetTableData instanceof TableData)) throw new Error(\"Invalid target table data was given\")\n\n    this.driver = driver\n    this.originalTableName = originalTableName\n    this.targetTableData = targetTableData\n    this.columnPairs = columnPairs\n  }\n\n  /**\n   * Runs to sqls.\n   * @returns {Promise<string[]>} - Resolves with SQL statements to execute in order.\n   */\n  async toSQLs() {\n    const driver = this.driver\n    const options = driver.options()\n    const originalTableName = this.originalTableName\n    const tempTableName = `${originalTableName}_velocious_rebuild`\n    const targetTableData = this.targetTableData\n    const previousTargetName = targetTableData.getName()\n\n    // Column-level `index: true` indexes are named after the table they are created with, and\n    // ALTER TABLE ... RENAME does not rename indexes - creating them inside the temp table's\n    // CREATE would leak the temp rebuild name permanently. Strip the flags for the temp CREATE\n    // and create those indexes explicitly on the temp table with their FINAL names BEFORE the\n    // copy: index names are database-global and survive the rename, and a violation (e.g. a new\n    // unique index over rows that all receive the same default) fails during INSERT...SELECT,\n    // while the original table still exists - never after the swap.\n    /** @type {Array<{column: import(\"../../table-data/table-column.js\").default, index: ?, indexArgs: ?}>} */\n    const strippedColumnIndexes = []\n\n    for (const column of targetTableData.getColumns()) {\n      if (!column.getIndex()) continue\n\n      strippedColumnIndexes.push({column, index: column.getIndex(), indexArgs: column.getIndexArgs()})\n      column.setIndex(false)\n    }\n\n    targetTableData.setName(tempTableName)\n\n    let createTableSQLs\n\n    try {\n      createTableSQLs = await driver.createTableSql(targetTableData)\n    } finally {\n      targetTableData.setName(previousTargetName)\n\n      for (const {column, index} of strippedColumnIndexes) column.setIndex(index)\n    }\n\n    const newColumnsSQL = this.columnPairs.map(([, newName]) => options.quoteColumnName(newName)).join(\", \")\n    const oldColumnsSQL = this.columnPairs.map(([oldName]) => options.quoteColumnName(oldName)).join(\", \")\n\n    const sqls = []\n\n    for (const sql of createTableSQLs) sqls.push(sql)\n\n    for (const {column, indexArgs} of strippedColumnIndexes) {\n      const {unique, ...restIndexArgs} = indexArgs || {}\n\n      restArgsError(restIndexArgs)\n\n      const createIndexSQLs = await new CreateIndexBase({\n        columns: [column.getName()],\n        driver,\n        name: `index_on_${originalTableName}_${column.getName()}`,\n        tableName: tempTableName,\n        unique\n      }).toSQLs()\n\n      for (const sql of createIndexSQLs) sqls.push(sql)\n    }\n\n    if (this.columnPairs.length > 0) {\n      sqls.push(\n        `INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) ` +\n        `SELECT ${oldColumnsSQL} FROM ${options.quoteTableName(originalTableName)}`\n      )\n    }\n\n    sqls.push(`DROP TABLE ${options.quoteTableName(originalTableName)}`)\n    sqls.push(`ALTER TABLE ${options.quoteTableName(tempTableName)} RENAME TO ${options.quoteTableName(originalTableName)}`)\n\n    for (const tableDataIndex of targetTableData.getIndexes()) {\n      const createIndexSQLs = await new CreateIndexBase({\n        columns: tableDataIndex.getColumns(),\n        driver,\n        name: tableDataIndex.getName(),\n        tableName: originalTableName,\n        unique: tableDataIndex.getUnique()\n      }).toSQLs()\n\n      for (const sql of createIndexSQLs) sqls.push(sql)\n    }\n\n    return sqls\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -52,6 +52,23 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
52
52
|
const targetTableData = this.targetTableData
|
|
53
53
|
const previousTargetName = targetTableData.getName()
|
|
54
54
|
|
|
55
|
+
// Column-level `index: true` indexes are named after the table they are created with, and
|
|
56
|
+
// ALTER TABLE ... RENAME does not rename indexes - creating them inside the temp table's
|
|
57
|
+
// CREATE would leak the temp rebuild name permanently. Strip the flags for the temp CREATE
|
|
58
|
+
// and create those indexes explicitly on the temp table with their FINAL names BEFORE the
|
|
59
|
+
// copy: index names are database-global and survive the rename, and a violation (e.g. a new
|
|
60
|
+
// unique index over rows that all receive the same default) fails during INSERT...SELECT,
|
|
61
|
+
// while the original table still exists - never after the swap.
|
|
62
|
+
/** @type {Array<{column: import("../../table-data/table-column.js").default, index: ?, indexArgs: ?}>} */
|
|
63
|
+
const strippedColumnIndexes = []
|
|
64
|
+
|
|
65
|
+
for (const column of targetTableData.getColumns()) {
|
|
66
|
+
if (!column.getIndex()) continue
|
|
67
|
+
|
|
68
|
+
strippedColumnIndexes.push({column, index: column.getIndex(), indexArgs: column.getIndexArgs()})
|
|
69
|
+
column.setIndex(false)
|
|
70
|
+
}
|
|
71
|
+
|
|
55
72
|
targetTableData.setName(tempTableName)
|
|
56
73
|
|
|
57
74
|
let createTableSQLs
|
|
@@ -60,6 +77,8 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
60
77
|
createTableSQLs = await driver.createTableSql(targetTableData)
|
|
61
78
|
} finally {
|
|
62
79
|
targetTableData.setName(previousTargetName)
|
|
80
|
+
|
|
81
|
+
for (const {column, index} of strippedColumnIndexes) column.setIndex(index)
|
|
63
82
|
}
|
|
64
83
|
|
|
65
84
|
const newColumnsSQL = this.columnPairs.map(([, newName]) => options.quoteColumnName(newName)).join(", ")
|
|
@@ -69,6 +88,22 @@ export default class VelociousDatabaseDriversSqliteTableRebuilder {
|
|
|
69
88
|
|
|
70
89
|
for (const sql of createTableSQLs) sqls.push(sql)
|
|
71
90
|
|
|
91
|
+
for (const {column, indexArgs} of strippedColumnIndexes) {
|
|
92
|
+
const {unique, ...restIndexArgs} = indexArgs || {}
|
|
93
|
+
|
|
94
|
+
restArgsError(restIndexArgs)
|
|
95
|
+
|
|
96
|
+
const createIndexSQLs = await new CreateIndexBase({
|
|
97
|
+
columns: [column.getName()],
|
|
98
|
+
driver,
|
|
99
|
+
name: `index_on_${originalTableName}_${column.getName()}`,
|
|
100
|
+
tableName: tempTableName,
|
|
101
|
+
unique
|
|
102
|
+
}).toSQLs()
|
|
103
|
+
|
|
104
|
+
for (const sql of createIndexSQLs) sqls.push(sql)
|
|
105
|
+
}
|
|
106
|
+
|
|
72
107
|
if (this.columnPairs.length > 0) {
|
|
73
108
|
sqls.push(
|
|
74
109
|
`INSERT INTO ${options.quoteTableName(tempTableName)} (${newColumnsSQL}) ` +
|