Fix missing model import import when using :copyfrom (#109)

rayakame · web-flow · commit 6653caa2d942 · 2025-05-28T16:59:39.000+02:00
* fix

* fragment
diff --git a/.changes/unreleased/Fixed-20250528-145714.yaml b/.changes/unreleased/Fixed-20250528-145714.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fixed missing model import when using `:copyfrom` cmd.
+time: 2025-05-28T14:57:14.0509214Z
+custom:
+    Author: rayakame
+    PR: "109"
diff --git a/internal/core/importer.go b/internal/core/importer.go
@@ -286,6 +286,12 @@ func (i *Importer) queryImportSpecs(_ string) (map[string]importSpec, map[string
 		//	continue
 		//}
 		queryValueModelImports(q.Ret)
+		if q.Cmd == metadata.CmdCopyFrom {
+			modelName, modelImport, err := i.getModelImportSpec()
+			if err == nil {
+				std[modelName] = modelImport
+			}
+		}
 	}
 
 	loc["models"] = importSpec{Module: i.C.Package, Name: "models"}
diff --git a/sqlc.yaml b/sqlc.yaml
@@ -3,7 +3,7 @@ plugins:
   - name: python
     wasm:
       url: file://sqlc-gen-better-python.wasm
-      sha256: cc86fe59be6e321df7b3a88bcc989d69bc35019d023c71f4f09bafbaac412747
+      sha256: 93df043f217f5bc2b9ce70c1283d36676b9ffe8f7ab9b5e8379db20db045e92f
 sql:
   - schema: test/schema.sql
     queries: test/queries.sql
diff --git a/test/driver_aiosqlite/attrs/classes/__init__.py b/test/driver_aiosqlite/attrs/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/attrs/classes/models.py b/test/driver_aiosqlite/attrs/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/attrs/classes/queries.py b/test/driver_aiosqlite/attrs/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/attrs/functions/__init__.py b/test/driver_aiosqlite/attrs/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/attrs/functions/models.py b/test/driver_aiosqlite/attrs/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/attrs/functions/queries.py b/test/driver_aiosqlite/attrs/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/dataclass/classes/__init__.py b/test/driver_aiosqlite/dataclass/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/dataclass/classes/models.py b/test/driver_aiosqlite/dataclass/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/dataclass/classes/queries.py b/test/driver_aiosqlite/dataclass/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/dataclass/functions/__init__.py b/test/driver_aiosqlite/dataclass/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/dataclass/functions/models.py b/test/driver_aiosqlite/dataclass/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/dataclass/functions/queries.py b/test/driver_aiosqlite/dataclass/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/msgspec/classes/__init__.py b/test/driver_aiosqlite/msgspec/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/msgspec/classes/models.py b/test/driver_aiosqlite/msgspec/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/msgspec/classes/queries.py b/test/driver_aiosqlite/msgspec/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/msgspec/functions/__init__.py b/test/driver_aiosqlite/msgspec/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_aiosqlite/msgspec/functions/models.py b/test/driver_aiosqlite/msgspec/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/msgspec/functions/queries.py b/test/driver_aiosqlite/msgspec/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_aiosqlite/sqlc-gen-better-python.wasm b/test/driver_aiosqlite/sqlc-gen-better-python.wasm
diff --git a/test/driver_aiosqlite/sqlc.yaml b/test/driver_aiosqlite/sqlc.yaml
@@ -3,7 +3,7 @@ plugins:
   - name: python
     wasm:
       url: file://sqlc-gen-better-python.wasm
-      sha256: cc86fe59be6e321df7b3a88bcc989d69bc35019d023c71f4f09bafbaac412747
+      sha256: 93df043f217f5bc2b9ce70c1283d36676b9ffe8f7ab9b5e8379db20db045e92f
 sql:
   - schema: schema.sql
     queries: queries.sql
diff --git a/test/driver_asyncpg/attrs/classes/__init__.py b/test/driver_asyncpg/attrs/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/attrs/classes/models.py b/test/driver_asyncpg/attrs/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/attrs/classes/queries.py b/test/driver_asyncpg/attrs/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/attrs/functions/__init__.py b/test/driver_asyncpg/attrs/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/attrs/functions/models.py b/test/driver_asyncpg/attrs/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/attrs/functions/queries.py b/test/driver_asyncpg/attrs/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/dataclass/classes/__init__.py b/test/driver_asyncpg/dataclass/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/dataclass/classes/models.py b/test/driver_asyncpg/dataclass/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/dataclass/classes/queries.py b/test/driver_asyncpg/dataclass/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/dataclass/functions/__init__.py b/test/driver_asyncpg/dataclass/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/dataclass/functions/models.py b/test/driver_asyncpg/dataclass/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/dataclass/functions/queries.py b/test/driver_asyncpg/dataclass/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/msgspec/classes/__init__.py b/test/driver_asyncpg/msgspec/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/msgspec/classes/models.py b/test/driver_asyncpg/msgspec/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/msgspec/classes/queries.py b/test/driver_asyncpg/msgspec/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/msgspec/functions/__init__.py b/test/driver_asyncpg/msgspec/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_asyncpg/msgspec/functions/models.py b/test/driver_asyncpg/msgspec/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/msgspec/functions/queries.py b/test/driver_asyncpg/msgspec/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_asyncpg/sqlc-gen-better-python.wasm b/test/driver_asyncpg/sqlc-gen-better-python.wasm
diff --git a/test/driver_asyncpg/sqlc.yaml b/test/driver_asyncpg/sqlc.yaml
@@ -3,7 +3,7 @@ plugins:
   - name: python
     wasm:
       url: file://sqlc-gen-better-python.wasm
-      sha256: cc86fe59be6e321df7b3a88bcc989d69bc35019d023c71f4f09bafbaac412747
+      sha256: 93df043f217f5bc2b9ce70c1283d36676b9ffe8f7ab9b5e8379db20db045e92f
 sql:
   - schema: schema.sql
     queries: queries.sql
diff --git a/test/driver_sqlite3/attrs/classes/__init__.py b/test/driver_sqlite3/attrs/classes/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_sqlite3/attrs/classes/models.py b/test/driver_sqlite3/attrs/classes/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_sqlite3/attrs/classes/queries.py b/test/driver_sqlite3/attrs/classes/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_sqlite3/attrs/functions/__init__.py b/test/driver_sqlite3/attrs/functions/__init__.py
@@ -1,5 +1,5 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Package containing queries and models automatically generated using sqlc-gen-better-python."""
diff --git a/test/driver_sqlite3/attrs/functions/models.py b/test/driver_sqlite3/attrs/functions/models.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing models."""
 from __future__ import annotations
 
diff --git a/test/driver_sqlite3/attrs/functions/queries.py b/test/driver_sqlite3/attrs/functions/queries.py
@@ -1,7 +1,7 @@
 # Code generated by sqlc. DO NOT EDIT.
 # versions:
 #   sqlc v1.28.0
-#   sqlc-gen-better-python v0.4.1
+#   sqlc-gen-better-python v0.4.2
 """Module containing queries from file queries.sql."""
 from __future__ import annotations
 
diff --git a/test/driver_sqlite3/dataclass/classes/__init__.py b/test/driver_sqlite3/dataclass/classes/__init__.py
diff --git a/test/driver_sqlite3/dataclass/classes/models.py b/test/driver_sqlite3/dataclass/classes/models.py
diff --git a/test/driver_sqlite3/dataclass/classes/queries.py b/test/driver_sqlite3/dataclass/classes/queries.py
diff --git a/test/driver_sqlite3/dataclass/functions/__init__.py b/test/driver_sqlite3/dataclass/functions/__init__.py
diff --git a/test/driver_sqlite3/dataclass/functions/models.py b/test/driver_sqlite3/dataclass/functions/models.py
diff --git a/test/driver_sqlite3/dataclass/functions/queries.py b/test/driver_sqlite3/dataclass/functions/queries.py
diff --git a/test/driver_sqlite3/msgspec/classes/__init__.py b/test/driver_sqlite3/msgspec/classes/__init__.py
diff --git a/test/driver_sqlite3/msgspec/classes/models.py b/test/driver_sqlite3/msgspec/classes/models.py
diff --git a/test/driver_sqlite3/msgspec/classes/queries.py b/test/driver_sqlite3/msgspec/classes/queries.py
diff --git a/test/driver_sqlite3/msgspec/functions/__init__.py b/test/driver_sqlite3/msgspec/functions/__init__.py
diff --git a/test/driver_sqlite3/msgspec/functions/models.py b/test/driver_sqlite3/msgspec/functions/models.py
diff --git a/test/driver_sqlite3/msgspec/functions/queries.py b/test/driver_sqlite3/msgspec/functions/queries.py
diff --git a/test/driver_sqlite3/sqlc-gen-better-python.wasm b/test/driver_sqlite3/sqlc-gen-better-python.wasm
diff --git a/test/driver_sqlite3/sqlc.yaml b/test/driver_sqlite3/sqlc.yaml
