mirror of
https://github.com/screentinker/screentinker.git
synced 2026-06-17 03:32:32 -06:00
Merge pull request #52 from screentinker/fix/migrate-count-addcolumn
fix(db): boot log counts only ADD COLUMN (#37 follow-up)
This commit is contained in:
commit
e2460855d9
|
|
@ -185,9 +185,14 @@ const migrations = [
|
||||||
// a swallowed failure left users.must_change_password absent -> total auth lockout).
|
// a swallowed failure left users.must_change_password absent -> total auth lockout).
|
||||||
let _migApplied = 0;
|
let _migApplied = 0;
|
||||||
for (const sql of migrations) {
|
for (const sql of migrations) {
|
||||||
|
// Only a successful ADD COLUMN means a genuinely-new column (it would throw
|
||||||
|
// "duplicate column" if it already existed). UPDATE/index statements always
|
||||||
|
// succeed, so they must NOT count toward "new migrations applied" or the boot
|
||||||
|
// would falsely report work on every healthy start.
|
||||||
|
const isAddColumn = /alter\s+table\s+\S+\s+add\s+column/i.test(sql);
|
||||||
try {
|
try {
|
||||||
db.exec(sql);
|
db.exec(sql);
|
||||||
_migApplied++;
|
if (isAddColumn) _migApplied++;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (!/duplicate column name|already exists/i.test(e.message)) {
|
if (!/duplicate column name|already exists/i.test(e.message)) {
|
||||||
console.error(`[migrate] FAILED: ${sql}\n -> ${e.message}`);
|
console.error(`[migrate] FAILED: ${sql}\n -> ${e.message}`);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue