Fix embedding

kyleconroy · kyleconroy · commit 3adb341f8019 · 2023-10-09T17:23:45.000-07:00
diff --git a/internal/compiler/analyze.go b/internal/compiler/analyze.go
@@ -62,12 +62,21 @@ func combineAnalysis(prev *analysis, a *analyzer.Analysis) *analysis {
 			Parameters: params,
 		}
 	}
+
 	if len(prev.Columns) == len(cols) {
 		for i := range prev.Columns {
 			prev.Columns[i].DataType = cols[i].DataType
 		}
 	} else {
-		prev.Columns = cols
+		embedding := false
+		for i := range prev.Columns {
+			if prev.Columns[i].EmbedTable != nil {
+				embedding = true
+			}
+		}
+		if !embedding {
+			prev.Columns = cols
+		}
 	}
 	if len(prev.Parameters) == len(params) {
 		for i := range prev.Parameters {

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,21 @@ func combineAnalysis(prev analysis, a analyzer.Analysis) *analysis {`
`62`	`62`	`Parameters: params,`
`63`	`63`	`}`
`64`	`64`	`}`
	`65`	`+`
`65`	`66`	`if len(prev.Columns) == len(cols) {`
`66`	`67`	`for i := range prev.Columns {`
`67`	`68`	`prev.Columns[i].DataType = cols[i].DataType`
`68`	`69`	`}`
`69`	`70`	`} else {`
`70`		`- prev.Columns = cols`
	`71`	`+ embedding := false`
	`72`	`+ for i := range prev.Columns {`
	`73`	`+ if prev.Columns[i].EmbedTable != nil {`
	`74`	`+ embedding = true`
	`75`	`+ }`
	`76`	`+ }`
	`77`	`+ if !embedding {`
	`78`	`+ prev.Columns = cols`
	`79`	`+ }`
`71`	`80`	`}`
`72`	`81`	`if len(prev.Parameters) == len(params) {`
`73`	`82`	`for i := range prev.Parameters {`