chore(insights): correct DB migration script

QwikDev · Aug 25, 2023 · 4ddf56f · 4ddf56f
1 parent fc748da
commit 4ddf56f
Show file tree

Hide file tree

Showing 7 changed files with 304 additions and 83 deletions.
diff --git a/packages/insights/drizzle/0012_omniscient_leader.sql b/packages/insights/drizzle/0012_omniscient_leader.sql
@@ -10,6 +10,22 @@ CREATE TABLE `symbolDetailTmp` (
 	FOREIGN KEY (`public_api_key`) REFERENCES `applications`(`public_api_key`) ON UPDATE no action ON DELETE no action,
 	FOREIGN KEY (`public_api_key`,`manifest_hash`) REFERENCES `manifests`(`public_api_key`,`hash`) ON UPDATE no action ON DELETE no action
 );--> statement-breakpoint
-INSERT INTO `symbolDetailTmp` SELECT * FROM `symbolDetail`;--> statement-breakpoint
+INSERT INTO `symbolDetailTmp` (
+	`hash`,
+	`public_api_key`,
+	`manifest_hash`,
+	`full_name`,
+	`origin`,
+	`lo`,
+	`hi`
+) SELECT 
+	`hash`,
+	`public_api_key`,
+	`manifest_hash`,
+	`full_name`,
+	`origin`,
+	`lo`,
+	`hi`
+ FROM `symbolDetail`;--> statement-breakpoint
 DROP TABLE `symbolDetail`;--> statement-breakpoint
 ALTER TABLE `symbolDetailTmp` RENAME TO `symbolDetail`;
diff --git a/packages/insights/package.json b/packages/insights/package.json
@@ -9,8 +9,8 @@
     "@typescript/analyze-trace": "^0.10.0",
     "density-clustering": "^1.3.0",
     "dotenv": "^16.3.1",
-    "drizzle-kit": "^0.19.12",
-    "drizzle-orm": "^0.28.2",
+    "drizzle-kit": "^0.19.13",
+    "drizzle-orm": "0.27.2",
     "install": "^0.13.0"
   },
   "devDependencies": {
@@ -29,7 +29,7 @@
     "eslint-plugin-qwik": "1.2.6",
     "netlify-cli": "^15.9.1",
     "prettier": "3.0.0",
-    "typescript": "5.1.6",
+    "typescript": "5.2.2",
     "undici": "5.22.1",
     "uvu": "0.5.6",
     "vite": "4.4.7",

diff --git a/packages/insights/src/db/query-helpers.ts b/packages/insights/src/db/query-helpers.ts
@@ -1,5 +1,5 @@
-import { sql, type InferInsertModel } from 'drizzle-orm';
-import { edgeTable, type routesTable } from './schema';
+import { sql } from 'drizzle-orm';
+import { type DatabaseInsert, edgeTable, type routesTable } from './schema';
 import { BUCKETS } from '~/stats/vector';
 
 export type VectorKeys<PREFIX extends string> =
@@ -81,7 +81,7 @@ export function createEdgeRow({
   interaction: boolean;
   delayBucket: number;
   latencyBucket: number;
-}): InferInsertModel<typeof edgeTable> {
+}): DatabaseInsert['edgeTable'] {
   return {
     publicApiKey,
     manifestHash,

diff --git a/packages/insights/src/db/schema.ts b/packages/insights/src/db/schema.ts
@@ -1,3 +1,4 @@
+import { type InferModel } from 'drizzle-orm';
 import {
   integer,
   sqliteTable,
@@ -10,6 +11,17 @@ import {
 export type DatabaseSchema = {
   applicationTable: typeof applicationTable;
   symbolTable: typeof symbolTable;
+  symbolDetailTable: typeof symbolDetailTable;
+  errorTable: typeof errorTable;
+};
+
+export type DatabaseInsert = {
+  edgeTable: InferModel<typeof edgeTable, 'insert'>;
+};
+
+export type DatabaseSelect = {
+  edgeTable: InferModel<typeof edgeTable, 'select'>;
+  manifestTable: InferModel<typeof manifestTable, 'select'>;
 };
 
 export const applicationTable = sqliteTable(

diff --git a/packages/insights/src/db/sql-manifest.ts b/packages/insights/src/db/sql-manifest.ts
@@ -1,12 +1,12 @@
-import { eq, and, type InferSelectModel, sql } from 'drizzle-orm';
+import { eq, and, sql } from 'drizzle-orm';
 import { type AppDatabase } from './index';
-import { edgeTable, manifestTable } from './schema';
+import { type DatabaseSelect, edgeTable, manifestTable } from './schema';
 import { latencyColumnSums, toVector } from './query-helpers';
 
 export async function dbGetManifests(
   db: AppDatabase,
   publicApiKey: string
-): Promise<InferSelectModel<typeof manifestTable>[]> {
+): Promise<DatabaseSelect['manifestTable'][]> {
   const manifests = await db
     .select()
     .from(manifestTable)

diff --git a/packages/insights/vite.config.ts b/packages/insights/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig(async () => {
       qwikTypes(),
       qwikVite(),
       tsconfigPaths({ projects: ['.'] }),
-      qwikInsights({ publicApiKey: loadEnv('', '.', '').PUBLIC_QWIK_INSIGHTS_KEY }),
+      // qwikInsights({ publicApiKey: loadEnv('', '.', '').PUBLIC_QWIK_INSIGHTS_KEY }),
     ],
     preview: {
       headers: {
@@ -23,5 +23,10 @@ export default defineConfig(async () => {
     optimizeDeps: {
       include: ['@auth/core'],
     },
+    build: {
+      rollupOptions: {
+        external: ['@libsql/client'],
+      },
+    },
   };
 });