More progress

kyleconroy · kyleconroy · commit 3825d3a2a88e · 2022-01-22T09:00:00.000-08:00
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -17,8 +17,10 @@ func pluginCatalog(c *catalog.Catalog) *plugin.Catalog {
 
 func pluginQueries(r *compiler.Result) []*plugin.Query {
 	var out []*plugin.Query
-	for range r.Queries {
-		out = append(out, &plugin.Query{})
+	for _, q := range r.Queries {
+		out = append(out, &plugin.Query{
+			Text: q.SQL,
+		})
 	}
 	return out
 }
diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
@@ -91,7 +91,7 @@ message Column
 
 message Query
 {
-  string sql = 1 [json_name="sql"];
+  string text = 1 [json_name="text"];
   string name = 2 [json_name="name"];
   string cmd = 3 [json_name="cmd"];
   repeated Column columns = 4 [json_name="columns"];

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,10 @@ func pluginCatalog(c catalog.Catalog) plugin.Catalog {`
`17`	`17`
`18`	`18`	`func pluginQueries(r compiler.Result) []plugin.Query {`
`19`	`19`	`var out []*plugin.Query`
`20`		`- for range r.Queries {`
`21`		`- out = append(out, &plugin.Query{})`
	`20`	`+ for _, q := range r.Queries {`
	`21`	`+ out = append(out, &plugin.Query{`
	`22`	`+ Text: q.SQL,`
	`23`	`+ })`
`22`	`24`	`}`
`23`	`25`	`return out`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ message Column`
`91`	`91`
`92`	`92`	`message Query`
`93`	`93`	`{`
`94`		`- string sql = 1 [json_name="sql"];`
	`94`	`+ string text = 1 [json_name="text"];`
`95`	`95`	`string name = 2 [json_name="name"];`
`96`	`96`	`string cmd = 3 [json_name="cmd"];`
`97`	`97`	`repeated Column columns = 4 [json_name="columns"];`