python: Port all Python tests to sqlc-gen-python (#1907)

kyleconroy · web-flow · commit 89c6aa19c03f · 2022-10-22T22:33:58.000-07:00
* python: Port all Python tests to sqlc-gen-python
* wasm: Return error message from codegen output
diff --git a/examples/python/sqlc.json b/examples/python/sqlc.json
@@ -5,7 +5,7 @@
       "name": "py",
       "wasm": {
         "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
-        "sha256": "428476c7408fd4c032da4ec74e8a7344f4fa75e0f98a5a3302f238283b9b95f2"
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
       }
     }
   ],
diff --git a/internal/endtoend/testdata/emit_pydantic_models/sqlc.json b/internal/endtoend/testdata/emit_pydantic_models/sqlc.json
@@ -1,19 +1,31 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "postgresql/schema.sql",
       "queries": "postgresql/query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "postgresql",
-          "package": "postgresql",
-          "emit_sync_querier": true,
-          "emit_async_querier": true,
-          "emit_pydantic_models": true
+          "options": {
+            "package": "postgresql",
+            "emit_sync_querier": true,
+            "emit_async_querier": true,
+            "emit_pydantic_models": true
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/exec_result/python_postgresql/sqlc.json b/internal/endtoend/testdata/exec_result/python_postgresql/sqlc.json
@@ -1,18 +1,30 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/exec_rows/python_postgresql/sqlc.json b/internal/endtoend/testdata/exec_rows/python_postgresql/sqlc.json
@@ -1,18 +1,30 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/inflection_exclude_table_names/python_postgresql/sqlc.json b/internal/endtoend/testdata/inflection_exclude_table_names/python_postgresql/sqlc.json
@@ -1,22 +1,34 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true,
-          "inflection_exclude_table_names": [
-            "my_data",
-            "exclusions"
-          ]
-        }
-      }
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true,
+            "inflection_exclude_table_names": [
+              "my_data",
+              "exclusions"
+            ]
+         }
+       }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/sqlc.json
@@ -1,19 +1,31 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true,
-          "query_parameter_limit": -1
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true,
+            "query_parameter_limit": -1
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/stderr.txt b/internal/endtoend/testdata/query_parameter_limit/-1/python_postgresql/stderr.txt
@@ -1 +1,2 @@
-error parsing sqlc.json: invalid query parameter limit
+# package py
+error generating code: error generating output: invalid query parameter limit
diff --git a/internal/endtoend/testdata/query_parameter_limit/0/python_postgresql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit/0/python_postgresql/sqlc.json
@@ -1,19 +1,31 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true,
-          "query_parameter_limit": 0
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true,
+            "query_parameter_limit": 0
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/query_parameter_limit/2/python_postgresql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit/2/python_postgresql/sqlc.json
@@ -1,19 +1,31 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true,
-          "query_parameter_limit": 2
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true,
+            "query_parameter_limit": 2
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/endtoend/testdata/query_parameter_limit/undefined/python_postgresql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit/undefined/python_postgresql/sqlc.json
@@ -1,18 +1,30 @@
 {
   "version": "2",
+  "plugins": [
+    {
+      "name": "py",
+      "wasm": {
+        "url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",
+        "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"
+      }
+    }
+  ],
   "sql": [
     {
       "schema": "query.sql",
       "queries": "query.sql",
       "engine": "postgresql",
-      "gen": {
-        "python": {
+      "codegen": [
+        {
+          "plugin": "py",
           "out": "python",
-          "package": "querytest",
-          "emit_sync_querier": true,
-          "emit_async_querier": true
+          "options": {
+            "package": "querytest",
+            "emit_sync_querier": true,
+            "emit_async_querier": true
+          }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"crypto/sha256"
 	_ "embed"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -252,6 +253,11 @@ func (r *Runner) Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plu
 	_, err = nom.Call(store)
 	callRegion.End()
 	if err != nil {
+		// Print WASM stdout
+		stderrBlob, err := os.ReadFile(stderrPath)
+		if err == nil && len(stderrBlob) > 0 {
+			return nil, errors.New(string(stderrBlob))
+		}
 		return nil, fmt.Errorf("call: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"name": "py",`
`6`	`6`	`"wasm": {`
`7`	`7`	`"url": "https://github.com/tabbed/sqlc-gen-python/releases/download/v0.16.0-alpha/sqlc-gen-python.wasm",`
`8`		`- "sha256": "428476c7408fd4c032da4ec74e8a7344f4fa75e0f98a5a3302f238283b9b95f2"`
	`8`	`+ "sha256": "4fb54ee7d25b4d909b59a8271ebee60ad76ff17b10d61632a5ca5651e4bfe438"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-error parsing sqlc.json: invalid query parameter limit`
	`1`	`+# package py`
	`2`	`+error generating code: error generating output: invalid query parameter limit`