postgres support.

lnbits/extensions/bleskomat/crud.py

@@ -21,7 +21,7 @@ async def create_bleskomat(
     api_key_encoding = "hex"
     await db.execute(
         """
-        INSERT INTO bleskomats (id, wallet, api_key_id, api_key_secret, api_key_encoding, name, fiat_currency, exchange_rate_provider, fee)
+        INSERT INTO bleskomat.bleskomats (id, wallet, api_key_id, api_key_secret, api_key_encoding, name, fiat_currency, exchange_rate_provider, fee)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -42,13 +42,13 @@ async def create_bleskomat(
 
 
 async def get_bleskomat(bleskomat_id: str) -> Optional[Bleskomat]:
-    row = await db.fetchone("SELECT * FROM bleskomats WHERE id = ?", (bleskomat_id,))
+    row = await db.fetchone("SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,))
     return Bleskomat(**row) if row else None
 
 
 async def get_bleskomat_by_api_key_id(api_key_id: str) -> Optional[Bleskomat]:
     row = await db.fetchone(
-        "SELECT * FROM bleskomats WHERE api_key_id = ?", (api_key_id,)
+        "SELECT * FROM bleskomat.bleskomats WHERE api_key_id = ?", (api_key_id,)
     )
     return Bleskomat(**row) if row else None
 
@@ -58,7 +58,7 @@ async def get_bleskomats(wallet_ids: Union[str, List[str]]) -> List[Bleskomat]:
         wallet_ids = [wallet_ids]
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM bleskomats WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM bleskomat.bleskomats WHERE wallet IN ({q})", (*wallet_ids,)
     )
     return [Bleskomat(**row) for row in rows]
 
@@ -66,14 +66,14 @@ async def get_bleskomats(wallet_ids: Union[str, List[str]]) -> List[Bleskomat]:
 async def update_bleskomat(bleskomat_id: str, **kwargs) -> Optional[Bleskomat]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE bleskomats SET {q} WHERE id = ?", (*kwargs.values(), bleskomat_id)
+        f"UPDATE bleskomat.bleskomats SET {q} WHERE id = ?", (*kwargs.values(), bleskomat_id)
     )
-    row = await db.fetchone("SELECT * FROM bleskomats WHERE id = ?", (bleskomat_id,))
+    row = await db.fetchone("SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,))
     return Bleskomat(**row) if row else None
 
 
 async def delete_bleskomat(bleskomat_id: str) -> None:
-    await db.execute("DELETE FROM bleskomats WHERE id = ?", (bleskomat_id,))
+    await db.execute("DELETE FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,))
 
 
 async def create_bleskomat_lnurl(
@@ -84,7 +84,7 @@ async def create_bleskomat_lnurl(
     now = int(time.time())
     await db.execute(
         """
-        INSERT INTO bleskomat_lnurls (id, bleskomat, wallet, hash, tag, params, api_key_id, initial_uses, remaining_uses, created_time, updated_time)
+        INSERT INTO bleskomat.bleskomat_lnurls (id, bleskomat, wallet, hash, tag, params, api_key_id, initial_uses, remaining_uses, created_time, updated_time)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -108,5 +108,5 @@ async def create_bleskomat_lnurl(
 
 async def get_bleskomat_lnurl(secret: str) -> Optional[BleskomatLnurl]:
     hash = generate_bleskomat_lnurl_hash(secret)
-    row = await db.fetchone("SELECT * FROM bleskomat_lnurls WHERE hash = ?", (hash,))
+    row = await db.fetchone("SELECT * FROM bleskomat.bleskomat_lnurls WHERE hash = ?", (hash,))
     return BleskomatLnurl(**row) if row else None

lnbits/extensions/bleskomat/migrations.py

@@ -2,7 +2,7 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS bleskomats (
+        CREATE TABLE bleskomat.bleskomats (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             api_key_id TEXT NOT NULL,
@@ -19,7 +19,7 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS bleskomat_lnurls (
+        CREATE TABLE bleskomat.bleskomat_lnurls (
             id TEXT PRIMARY KEY,
             bleskomat TEXT NOT NULL,
             wallet TEXT NOT NULL,

lnbits/extensions/bleskomat/models.py

@@ -100,7 +100,7 @@ class BleskomatLnurl(NamedTuple):
         now = int(time.time())
         result = await conn.execute(
             """
-            UPDATE bleskomat_lnurls
+            UPDATE bleskomat.bleskomat_lnurls
             SET remaining_uses = remaining_uses - 1, updated_time = ?
             WHERE id = ?
                 AND remaining_uses > 0