386: upgrade drizzle-kit and drizzle-orm

drizzle.config.ts

@@ -1,7 +1,7 @@
 // Drizzle kit configuration
-import type { Config } from "drizzle-kit";
+import { defineConfig } from "drizzle-kit";
 
-export default {
+export default defineConfig({
   schema: "./src/schema/*",
   dialect: "postgresql",
   out: "db/migration",
@@ -15,4 +15,4 @@ export default {
       rejectUnauthorized: false,
     },
   },
-} satisfies Config;
+});

package.json

@@ -34,7 +34,7 @@
     "@nestjs/core": "^10.0.0",
     "@nestjs/platform-express": "^10.4.5",
     "@nestjs/serve-static": "^4.0.0",
-    "drizzle-orm": "^0.31.1",
+    "drizzle-orm": "^0.36.1",
     "immer": "^10.1.1",
     "joi": "^17.11.0",
     "pg": "^8.11.3",
@@ -64,7 +64,7 @@
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "dotenv": "^16.3.1",
-    "drizzle-kit": "^0.22.2",
+    "drizzle-kit": "^0.28.0",
     "esbuild": "^0.21.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^9.0.0",
@@ -112,4 +112,4 @@
       "npm run lint"
     ]
   }
-}
+}

src/drizzle-pgis/index.ts

@@ -21,5 +21,3 @@ export {
   multiPolygonGeog,
   geometryCollectionGeog,
 } from "./geography";
-
-export { ST_AsGeoJSON } from "./spatial-type";

src/schema/budget-line.ts

@@ -8,11 +8,7 @@ export const budgetLine = pgTable(
     code: text("code").references(() => agencyBudget.code),
     id: text("id"),
   },
-  (table) => {
-    return {
-      pk: primaryKey({ columns: [table.code, table.id] }),
-    };
-  },
+  (table) => [primaryKey({ columns: [table.code, table.id] })],
 );
 
 export const budgetLineEntitySchema = z.object({

src/schema/capital-commitment.ts

@@ -25,18 +25,16 @@ export const capitalCommitment = pgTable(
     budgetLineCode: text("budget_line_code").notNull(),
     budgetLineId: text("budget_line_id").notNull(),
   },
-  (table) => {
-    return {
-      capitalProjectFk: foreignKey({
-        columns: [table.managingCode, table.capitalProjectId],
-        foreignColumns: [capitalProject.managingCode, capitalProject.id],
-      }),
-      budgetLineFk: foreignKey({
-        columns: [table.budgetLineCode, table.budgetLineId],
-        foreignColumns: [budgetLine.code, budgetLine.id],
-      }),
-    };
-  },
+  (table) => [
+    foreignKey({
+      columns: [table.managingCode, table.capitalProjectId],
+      foreignColumns: [capitalProject.managingCode, capitalProject.id],
+    }),
+    foreignKey({
+      columns: [table.budgetLineCode, table.budgetLineId],
+      foreignColumns: [budgetLine.code, budgetLine.id],
+    }),
+  ],
 );
 
 export const capitalCommitmentEntitySchema = z.object({

src/schema/capital-project-checkbook.ts

@@ -18,15 +18,13 @@ export const capitalProjectCheckbook = pgTable(
     capitalProjectId: text("capital_project_id"),
     value: numeric("value"),
   },
-  (table) => {
-    return {
-      fk: foreignKey({
-        columns: [table.managingCode, table.capitalProjectId],
-        foreignColumns: [capitalProject.managingCode, capitalProject.id],
-        name: "custom_fk",
-      }),
-    };
-  },
+  (table) => [
+    foreignKey({
+      columns: [table.managingCode, table.capitalProjectId],
+      foreignColumns: [capitalProject.managingCode, capitalProject.id],
+      name: "custom_fk",
+    }),
+  ],
 );
 
 export const capitalProjectCategoryEntitySchema = z.object({

src/schema/capital-project-fund.ts

@@ -37,15 +37,13 @@ export const capitalProjectFund = pgTable(
     stage: capitalProjectFundStageEnum("stage"),
     value: numeric("value"),
   },
-  (table) => {
-    return {
-      fk: foreignKey({
-        columns: [table.managingCode, table.capitalProjectId],
-        foreignColumns: [capitalProject.managingCode, capitalProject.id],
-        name: "custom_fk",
-      }),
-    };
-  },
+  (table) => [
+    foreignKey({
+      columns: [table.managingCode, table.capitalProjectId],
+      foreignColumns: [capitalProject.managingCode, capitalProject.id],
+      name: "custom_fk",
+    }),
+  ],
 );
 
 export const capitalProjectFundEntitySchema = z.object({

src/schema/capital-project.ts

@@ -38,15 +38,13 @@ export const capitalProject = pgTable(
     mercatorFillMPnt: multiPointGeom("mercator_fill_m_pnt", 3857),
     mercatorFillMPoly: multiPolygonGeom("mercator_fill_m_poly", 3857),
   },
-  (table) => {
-    return {
-      pk: primaryKey({ columns: [table.managingCode, table.id] }),
-      mercatorFillMPolyGix: index().using("GIST", table.mercatorFillMPoly),
-      mercatorFillMPntGix: index().using("GIST", table.mercatorFillMPnt),
-      liFtMPntGix: index().using("GIST", table.liFtMPnt),
-      liFtMPolyGix: index().using("GIST", table.liFtMPoly),
-    };
-  },
+  (table) => [
+    primaryKey({ columns: [table.managingCode, table.id] }),
+    index().using("GIST", table.mercatorFillMPoly),
+    index().using("GIST", table.mercatorFillMPnt),
+    index().using("GIST", table.liFtMPnt),
+    index().using("GIST", table.liFtMPoly),
+  ],
 );
 
 export const capitalProjectCategoryEnumSchema = z.enum([

src/schema/city-council-district.ts

@@ -10,13 +10,11 @@ export const cityCouncilDistrict = pgTable(
     mercatorFill: multiPolygonGeom("mercator_fill", 3857),
     mercatorLabel: pointGeom("mercator_label", 3857),
   },
-  (table) => {
-    return {
-      mercatorFillGix: index().using("GIST", table.mercatorFill),
-      mercatorLabelGix: index().using("GIST", table.mercatorLabel),
-      liFtGix: index().using("GIST", table.liFt),
-    };
-  },
+  (table) => [
+    index().using("GIST", table.mercatorFill),
+    index().using("GIST", table.mercatorLabel),
+    index().using("GIST", table.liFt),
+  ],
 );
 
 export const cityCouncilDistrictEntitySchema = z.object({

src/schema/community-district.ts

@@ -14,14 +14,12 @@ export const communityDistrict = pgTable(
     mercatorFill: multiPolygonGeom("mercator_fill", 3857),
     mercatorLabel: pointGeom("mercator_label", 3857),
   },
-  (table) => {
-    return {
-      pk: primaryKey({ columns: [table.boroughId, table.id] }),
-      liFtGix: index().using("GIST", table.liFt),
-      mercatorFillGix: index().using("GIST", table.mercatorFill),
-      mercatorLabelGix: index().using("GIST", table.mercatorLabel),
-    };
-  },
+  (table) => [
+    primaryKey({ columns: [table.boroughId, table.id] }),
+    index().using("GIST", table.liFt),
+    index().using("GIST", table.mercatorFill),
+    index().using("GIST", table.mercatorLabel),
+  ],
 );
 
 export const communityDistrictEntitySchema = z.object({