summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/go-xorm/xorm/engine.go
diff options
context:
space:
mode:
authorZsombor <gzsombor@users.noreply.github.com>2019-01-09 23:18:06 +0100
committertechknowlogick <hello@techknowlogick.com>2019-01-09 17:18:06 -0500
commit31aa00fa4b6a5e77b5bd4d29628860ff88eb4029 (patch)
treea099cd6921ef484c57e0abdfeff6eb46f8f39f81 /vendor/github.com/go-xorm/xorm/engine.go
parentdd13327382f76b7a5d2b5e98e75a6aaa9a67c313 (diff)
downloadgitea-31aa00fa4b6a5e77b5bd4d29628860ff88eb4029.tar.gz
gitea-31aa00fa4b6a5e77b5bd4d29628860ff88eb4029.zip
Update xorm to fix issue #5659 and #5651 (#5680)
Diffstat (limited to 'vendor/github.com/go-xorm/xorm/engine.go')
-rw-r--r--vendor/github.com/go-xorm/xorm/engine.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/go-xorm/xorm/engine.go b/vendor/github.com/go-xorm/xorm/engine.go
index 89a96d9fdb..04af3f210c 100644
--- a/vendor/github.com/go-xorm/xorm/engine.go
+++ b/vendor/github.com/go-xorm/xorm/engine.go
@@ -481,7 +481,8 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
}
cols := table.ColumnsSeq()
- colNames := dialect.Quote(strings.Join(cols, dialect.Quote(", ")))
+ colNames := engine.dialect.Quote(strings.Join(cols, engine.dialect.Quote(", ")))
+ destColNames := dialect.Quote(strings.Join(cols, dialect.Quote(", ")))
rows, err := engine.DB().Query("SELECT " + colNames + " FROM " + engine.Quote(table.Name))
if err != nil {
@@ -496,7 +497,7 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
return err
}
- _, err = io.WriteString(w, "INSERT INTO "+dialect.Quote(table.Name)+" ("+colNames+") VALUES (")
+ _, err = io.WriteString(w, "INSERT INTO "+dialect.Quote(table.Name)+" ("+destColNames+") VALUES (")
if err != nil {
return err
}