chore: update

Author: atinux

_nuxtflare/server/api/_hub/database/query.post.ts

@@ -10,15 +10,34 @@ export default eventHandler(async (event) => {
   // Make sure the client is initialized first
   useDatabase()
   const client = useDatabaseClient()
-  
-  console.log(client)
+
+  if (process.dev) {
+    try {
+      if (method === 'run')
+        return client.prepare(sql).run(params)
+      if (method === 'all' || method === 'values')
+        return client.prepare(sql).raw().all(params)
+      // method = 'get'
+      return client.prepare(sql).raw().get(params)
+    } catch (e: any) {
+      throw createError({
+        statusCode: 500,
+        message: `Database error: ${e.message}`
+      })
+    }
+  }
   try {
-    if (method === 'run')
-			return client.prepare(sql).run(params)
-    if (method === 'all' || method === 'values')
-      return client.prepare(sql).raw().all(params)
+    if (method === 'run') {
+      const { meta } = await client.prepare(sql).bind(...params).run()
+      return meta
+    }
+    if (method === 'all' || method === 'values') {
+      const { results } = await client.prepare(sql).bind(...params).raw()
+      return results
+    }
     // method = 'get'
-    return client.prepare(sql).raw().get(params)
+    const { results } = await client.prepare(sql).bind(...params).raw()
+    return results[0]
   } catch (e: any) {
     throw createError({
       statusCode: 500,

_nuxtflare/server/utils/database.ts

@@ -30,6 +30,8 @@ export const useDatabase = () => {
             method: 'POST',
             body: { sql, params, method }
           })
+          console.log(method, rows)
+          if (method === 'run') return rows
           return { rows }
         } catch (err) {
           console.error('Error from remote database', { sql, params, method }, err.data)

server/api/test.ts

@@ -1,9 +1,10 @@
-import { sql } from 'drizzle-orm'
+import { sql, eq } from 'drizzle-orm'
+import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core'
 
 export default defineEventHandler(async (event) => {
   const db = useDatabase()
 
-  const rows = await db.all(sql`
+  const tables = await db.all(sql`
     SELECT
       name
     FROM
@@ -14,5 +15,22 @@ export default defineEventHandler(async (event) => {
     ;
   `)
 
-  return rows
+  const todos = sqliteTable('todos', {
+    id: integer('id').primaryKey(),
+    text: text('text')
+  })
+  const inserted = await db.insert(todos).values({ text: 'hello' }).returning().get()
+  const todo = await db.select().from(todos).where(eq(todos.id, inserted.id)).get()
+  const updated = await db.update(todos).set({ text: 'Bonjour' }).where(eq(todos.id, inserted.id)).returning()
+  const all = await db.select().from(todos).limit(3)
+  const deleted = await db.delete(todos).where(eq(todos.id, all[0].id))
+  
+  return {
+    tables,
+    todo,
+    inserted,
+    updated,
+    deleted,
+    all
+  }
 })

server/database/migrations/0000_heavy_xorn.sql

@@ -0,0 +1,4 @@
+CREATE TABLE `todos` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`text` text NOT NULL
+);

server/database/migrations/0000_swift_stone_men.sql

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "3169bbf9-a9f8-4d6c-b3b7-5e9a28c97af3",
+  "id": "6d6fc5db-ed1d-4e06-bfbd-6b8a014b0b00",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "todos": {
@@ -14,34 +14,12 @@
           "notNull": true,
           "autoincrement": false
         },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
+        "text": {
+          "name": "text",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
-        },
-        "completed": {
-          "name": "completed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
         }
       },
       "indexes": {},

server/database/migrations/meta/0000_snapshot.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1702053632535,
-      "tag": "0000_heavy_xorn",
+      "when": 1706118044364,
+      "tag": "0000_swift_stone_men",
       "breakpoints": true
     }
   ]

server/database/migrations/meta/_journal.json

@@ -2,8 +2,5 @@ import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core'
 
 export const todos = sqliteTable('todos', {
   id: integer('id').primaryKey(),
-  userId: integer('user_id').notNull(), // GitHub Id
-  title: text('title').notNull(),
-  completed: integer('completed').notNull().default(0),
-  createdAt: integer('created_at', { mode: 'timestamp' }).notNull(),
+  text: text('text').notNull(),
 })