add parse for composite keys
This commit is contained in:
parent
c01da1b710
commit
6d6007e680
|
@ -306,11 +306,25 @@ func (db *sqlite3) GetColumns(tableName string) ([]string, map[string]*core.Colu
|
||||||
for _, colStr := range colCreates {
|
for _, colStr := range colCreates {
|
||||||
reg = regexp.MustCompile(`,\s`)
|
reg = regexp.MustCompile(`,\s`)
|
||||||
colStr = reg.ReplaceAllString(colStr, ",")
|
colStr = reg.ReplaceAllString(colStr, ",")
|
||||||
|
if strings.HasPrefix(strings.TrimSpace(colStr), "PRIMARY KEY") {
|
||||||
|
parts := strings.Split(strings.TrimSpace(colStr), "(")
|
||||||
|
if len(parts) == 2 {
|
||||||
|
pkCols := strings.Split(strings.TrimRight(strings.TrimSpace(parts[1]), ")"), ",")
|
||||||
|
for _, pk := range pkCols {
|
||||||
|
if col, ok := cols[strings.Trim(strings.TrimSpace(pk), "`")]; ok {
|
||||||
|
col.IsPrimaryKey = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
fields := strings.Fields(strings.TrimSpace(colStr))
|
fields := strings.Fields(strings.TrimSpace(colStr))
|
||||||
col := new(core.Column)
|
col := new(core.Column)
|
||||||
col.Indexes = make(map[string]int)
|
col.Indexes = make(map[string]int)
|
||||||
col.Nullable = true
|
col.Nullable = true
|
||||||
col.DefaultIsEmpty = true
|
col.DefaultIsEmpty = true
|
||||||
|
|
||||||
for idx, field := range fields {
|
for idx, field := range fields {
|
||||||
if idx == 0 {
|
if idx == 0 {
|
||||||
col.Name = strings.Trim(strings.Trim(field, "`[] "), `"`)
|
col.Name = strings.Trim(strings.Trim(field, "`[] "), `"`)
|
||||||
|
|
|
@ -1131,4 +1131,11 @@ func TestCompositePK(t *testing.T) {
|
||||||
assertSync(t, new(TaskSolution))
|
assertSync(t, new(TaskSolution))
|
||||||
|
|
||||||
assert.NoError(t, testEngine.Sync2(new(TaskSolution)))
|
assert.NoError(t, testEngine.Sync2(new(TaskSolution)))
|
||||||
|
tables, err := testEngine.DBMetas()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.EqualValues(t, 1, len(tables))
|
||||||
|
pkCols := tables[0].PKColumns()
|
||||||
|
assert.EqualValues(t, 2, len(pkCols))
|
||||||
|
assert.EqualValues(t, "uid", pkCols[0].Name)
|
||||||
|
assert.EqualValues(t, "tid", pkCols[1].Name)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue