add map name to idx

Author: elianddb

enginetest/queries/script_queries.go

@@ -137,15 +137,15 @@ var ScriptTests = []ScriptTest{
 			{
 				Query: `CREATE TABLE IF NOT EXISTS ost_user__cdata (
 						PRIMARY KEY (user_id)
-					) DEFAULT CHARSET=utf8 AS 
-					SELECT 
-						entry.object_id as user_id, 
+					) DEFAULT CHARSET=utf8 AS
+					SELECT
+						entry.object_id as user_id,
 						MAX(IF(field.id='1',coalesce(ans.value_id, ans.value),NULL)) as email
-						FROM ost_form_entry entry 
-						JOIN ost_form_entry_values ans 
-						ON ans.entry_id = entry.id 
-						JOIN ost_form_field field 
-						ON field.id=ans.field_id 
+						FROM ost_form_entry entry
+						JOIN ost_form_entry_values ans
+						ON ans.entry_id = entry.id
+						JOIN ost_form_field field
+						ON field.id=ans.field_id
 						WHERE entry.object_type='U' GROUP BY entry.object_id`,
 			},
 			{

sql/analyzer/resolve_create_select.go

@@ -38,30 +38,27 @@ func resolveCreateSelect(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.
 		newSch[i] = &tempCol
 	}
 
+	colNameToIdx := make(map[string]int, len(newSch))
+	for i, col := range newSch {
+		colNameToIdx[col.Name] = i
+	}
+
 	// Apply primary key constraints from index definitions to the merged schema
 	var nonPkIndexes sql.IndexDefs
+	pkOrdinals := make([]int, 0)
 	for _, idx := range ct.Indexes() {
 		if idx.IsPrimary() {
 			for _, idxCol := range idx.Columns {
-				for i, schCol := range newSch {
-					if schCol.Name == idxCol.Name {
-						newSch[i].PrimaryKey = true
-						break
-					}
+				if i, ok := colNameToIdx[idxCol.Name]; ok {
+					newSch[i].PrimaryKey = true
+					pkOrdinals = append(pkOrdinals, i)
 				}
 			}
 		} else {
 			nonPkIndexes = append(nonPkIndexes, idx)
 		}
 	}
 
-	pkOrdinals := make([]int, 0)
-	for i, col := range newSch {
-		if col.PrimaryKey {
-			pkOrdinals = append(pkOrdinals, i)
-		}
-	}
-
 	newSpec := &plan.TableSpec{
 		Schema:    sql.NewPrimaryKeySchema(newSch, pkOrdinals...),
 		IdxDefs:   nonPkIndexes, // Only pass non-PK indexes since PK is in schema