Merge pull request #148 from vdice/feat/opinionated-db-modules

feat(postgres/sqlite): update API to be fully async

Author: vdice

docs/v4/postgres.html

@@ -1,14 +1,12 @@
-from spin_sdk import http, postgres
+from spin_sdk import http, postgres, util
 from spin_sdk.http import Request, Response
-from spin_sdk.postgres import RowSet, DbValue
-
+from spin_sdk.postgres import Connection, RowSet, DbValue
 
 def format_value(db_value: DbValue) -> str:
     if hasattr(db_value, "value"):
         return str(db_value.value)
     return "NULL"
 
-
 def format_rowset(rowset: RowSet) -> str:
     lines = []
     col_names = [col.name for col in rowset.columns]
@@ -19,11 +17,12 @@ def format_rowset(rowset: RowSet) -> str:
         lines.append(" | ".join(values))
     return "\n".join(lines)
 
-
 class HttpHandler(http.Handler):
     async def handle_request(self, request: Request) -> Response:
-        with await postgres.open("user=postgres dbname=spin_dev host=localhost sslmode=disable password=password") as db:
-            rowset = db.query("SELECT * FROM test", [])
+        with await Connection.open("user=postgres dbname=spin_dev host=localhost sslmode=disable password=password") as db:
+            columns, stream, future = await db.query("SELECT * FROM test", [])
+            rows = await util.collect((stream, future))
+            rowset = RowSet(columns, list(rows))
             result = format_rowset(rowset)
 
         return Response(200, {"content-type": "text/plain"}, bytes(result, "utf-8"))

docs/v4/sqlite.html

@@ -1,13 +1,35 @@
-from spin_sdk import http, sqlite
+from spin_sdk import http
 from spin_sdk.http import Request, Response
-from spin_sdk.sqlite import Value_Integer
+from spin_sdk.sqlite import Connection, Value_Text, Value_Integer
+from spin_sdk.util import collect
 
 class HttpHandler(http.Handler):
     async def handle_request(self, request: Request) -> Response:
-        with await sqlite.open_default() as db:
-            result = db.execute("SELECT * FROM todos WHERE id > (?);", [Value_Integer(1)])
-            rows = result.rows
-        
+        with await Connection.open_default() as db:
+            _, stream, result = await db.execute(
+                "CREATE TABLE IF NOT EXISTS example (id INTEGER NOT NULL PRIMARY KEY, value TEXT NOT NULL)",
+                []
+            )
+            await collect((stream, result))
+
+            insert = "INSERT INTO example (id, value) VALUES (?, ?) ON CONFLICT (id) DO UPDATE SET value=excluded.value"
+
+            _, stream, result = await db.execute(insert, [Value_Integer(1), Value_Text("foo")])
+            await collect((stream, result))
+            
+            _, stream, result = await db.execute(insert, [Value_Integer(2), Value_Text("bar")])
+            await collect((stream, result))
+            
+            columns, stream, result = await db.execute("SELECT * FROM example WHERE id > (?);", [Value_Integer(0)])
+            rows = await collect((stream, result))
+
+            assert columns == ["id", "value"]
+            assert len(rows) == 1
+            assert isinstance(rows[0].values[0], Value_Integer)
+            assert rows[0].values[0].value == 2
+            assert isinstance(rows[0].values[1], Value_Text)
+            assert rows[0].values[1].value == "bar"
+
         return Response(
             200,
             {"content-type": "text/plain"},