Merge pull request #174 from DiscourseGraphs/ENG-328-forgot-a-step

ENG-328 forgot a step to apply migrations locally

Author: maparent

packages/database/README.md

@@ -15,11 +15,17 @@ All CLI commands below should be run in this directory (`packages/database`.)
    1. Assuming you're working on a feature branch.
    2. Make changes to the schema, by editing files in `packages/database/supabase/schemas`
    3. If you created a new schema file, make sure to add it to `[db.migrations] schema_paths` in `packages/database/supabase/config.toml`. Schema files are applied in that order, you may need to be strategic in placing your file.
-   4. `turbo build`, which will do the following:
-      1. Check your logic with `sqruff lint supabase/schemas`, and eventually `sqruff fix supabase/schemas`
-      2. Regenerate the types file with `supabase gen types typescript --local > types.gen.ts`
+   4. `turbo check-types`, which will do the following:
+      1. Check your logic with `sqruff lint supabase/schemas`
+         1. If there are errors there, you can fix them with `npm run lint:fix`
+      2. Stop supabase.
       3. See if there would be a migration to apply with `supabase db diff`
    5. If applying the new schema fails, repeat step 4
    6. If you are satisfied with the migration, create a migration file with `npm run dbdiff:save some_meaningful_migration_name`
       1. If all goes well, there should be a new file named `supbase/migration/2..._some_meaningful_migration_name.sql` which you should `git add`.
-   10. You can start using your changes again `turbo dev`
+   7. `turbo build`, which will do the following:
+      1. Start supbase
+      2. Apply the new migration locally
+      3. Regenerate the types file with `supabase gen types typescript --local > types.gen.ts`
+      4. Copy it where appropriate
+   8. You can start using your changes again `turbo dev`

packages/database/package.json

@@ -11,10 +11,10 @@
     "init": "supabase login",
     "dev": "supabase start",
     "stop": "supabase stop",
-    "build": "npm run lint && npm run gentypes:local && cp ./types.gen.ts ../../apps/website/app/utils/supabase && npm run dbdiff",
+    "check-types": "npm run lint && supabase stop && npm run dbdiff",
     "lint": "tsx scripts/lint.ts",
     "lint:fix": "tsx scripts/lint.ts -f",
-    "gentypes:local": "supabase start && supabase gen types typescript --local --schema public > types.gen.ts",
+    "build": "supabase start && supabase migrations up && supabase gen types typescript --local --schema public > types.gen.ts &&  && cp ./types.gen.ts ../../apps/website/app/utils/supabase",
     "gentypes:production": "supabase start && supabase gen types typescript --project-id \"$SUPABASE_PROJECT_ID\" --schema public > types.gen.ts",
     "dbdiff": "supabase stop && supabase db diff",
     "dbdiff:save": "supabase stop && supabase db diff -f",

packages/database/types.gen.ts

@@ -43,7 +43,7 @@ export type Database = {
             foreignKeyName: "Account_platform_id_fkey"
             columns: ["platform_id"]
             isOneToOne: false
-            referencedRelation: "DiscoursePlatform"
+            referencedRelation: "Platform"
             referencedColumns: ["id"]
           },
         ]
@@ -167,7 +167,7 @@ export type Database = {
             foreignKeyName: "Concept_space_id_fkey"
             columns: ["space_id"]
             isOneToOne: false
-            referencedRelation: "DiscourseSpace"
+            referencedRelation: "Space"
             referencedColumns: ["id"]
           },
         ]
@@ -278,7 +278,7 @@ export type Database = {
             foreignKeyName: "Content_space_id_fkey"
             columns: ["space_id"]
             isOneToOne: false
-            referencedRelation: "DiscourseSpace"
+            referencedRelation: "Space"
             referencedColumns: ["id"]
           },
         ]
@@ -342,53 +342,6 @@ export type Database = {
           },
         ]
       }
-      DiscoursePlatform: {
-        Row: {
-          id: number
-          name: string
-          url: string
-        }
-        Insert: {
-          id?: number
-          name: string
-          url: string
-        }
-        Update: {
-          id?: number
-          name?: string
-          url?: string
-        }
-        Relationships: []
-      }
-      DiscourseSpace: {
-        Row: {
-          discourse_platform_id: number
-          id: number
-          name: string
-          url: string | null
-        }
-        Insert: {
-          discourse_platform_id: number
-          id?: number
-          name: string
-          url?: string | null
-        }
-        Update: {
-          discourse_platform_id?: number
-          id?: number
-          name?: string
-          url?: string | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "DiscourseSpace_discourse_platform_id_fkey"
-            columns: ["discourse_platform_id"]
-            isOneToOne: false
-            referencedRelation: "DiscoursePlatform"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
       Document: {
         Row: {
           author_id: number
@@ -435,7 +388,7 @@ export type Database = {
             foreignKeyName: "Document_space_id_fkey"
             columns: ["space_id"]
             isOneToOne: false
-            referencedRelation: "DiscourseSpace"
+            referencedRelation: "Space"
             referencedColumns: ["id"]
           },
         ]
@@ -469,6 +422,53 @@ export type Database = {
           },
         ]
       }
+      Platform: {
+        Row: {
+          id: number
+          name: string
+          url: string
+        }
+        Insert: {
+          id?: number
+          name: string
+          url: string
+        }
+        Update: {
+          id?: number
+          name?: string
+          url?: string
+        }
+        Relationships: []
+      }
+      Space: {
+        Row: {
+          id: number
+          name: string
+          platform_id: number
+          url: string | null
+        }
+        Insert: {
+          id?: number
+          name: string
+          platform_id: number
+          url?: string | null
+        }
+        Update: {
+          id?: number
+          name?: string
+          platform_id?: number
+          url?: string | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "Space_platform_id_fkey"
+            columns: ["platform_id"]
+            isOneToOne: false
+            referencedRelation: "Platform"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       SpaceAccess: {
         Row: {
           account_id: number
@@ -500,7 +500,7 @@ export type Database = {
             foreignKeyName: "SpaceAccess_space_id_fkey"
             columns: ["space_id"]
             isOneToOne: false
-            referencedRelation: "DiscourseSpace"
+            referencedRelation: "Space"
             referencedColumns: ["id"]
           },
         ]
@@ -555,6 +555,12 @@ export type Database = {
         }
         Returns: undefined
       }
+      get_nodes_needing_sync: {
+        Args: { nodes_from_roam: Json }
+        Returns: {
+          uid_to_sync: string
+        }[]
+      }
       match_content_embeddings: {
         Args: {
           query_embedding: string