Spark/spark-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 镜像纳入 spark-seed，migrate 忽略已删列导致的 1054

Browse Source 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
DESKTOP-L8OUL9F\gfl0034 2026-09-23 18:15:48 +08:00
parent f724f66d1e
commit a9de10fdfc
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -12,6 +12,7 @@ ENV TZ=Asia/Shanghai
WORKDIR /app WORKDIR /app
COPY bin/linux_amd64/spark-server /usr/local/bin/spark-server COPY bin/linux_amd64/spark-server /usr/local/bin/spark-server
COPY bin/linux_amd64/spark-migrate /usr/local/bin/spark-migrate COPY bin/linux_amd64/spark-migrate /usr/local/bin/spark-migrate
COPY bin/linux_amd64/spark-seed /usr/local/bin/spark-seed
COPY migrations /app/migrations COPY migrations /app/migrations
RUN mkdir -p /app/logs && chown -R spark:spark /app RUN mkdir -p /app/logs && chown -R spark:spark /app
USER spark USER spark

1
cmd/migrate/main.go
View File

@ -126,6 +126,7 @@ func ignorableDDL(err error) bool {
switch me.Number { switch me.Number {
case 1050, // table already exists case 1050, // table already exists
1051, // unknown table 1051, // unknown table
1054, // unknown column (later migration dropped it; comment-only MODIFY is obsolete)
1060, // duplicate column 1060, // duplicate column
1061, // duplicate key name 1061, // duplicate key name
1091, // can't drop; check that column/key exists 1091, // can't drop; check that column/key exists