prisma error fixed - related to prisma/prisma#16600

weareinreach · Dec 2, 2022 · 8a47669 · 8a47669
1 parent e91e436
commit 8a47669
Show file tree

Hide file tree

Showing 9 changed files with 3,217 additions and 1,136 deletions.
diff --git a/packages/db/index.ts b/packages/db/index.ts
@@ -6,10 +6,10 @@ declare global {
 	var prisma: PrismaClient | undefined
 }
 
-export const prisma: PrismaClient =
+export const prisma =
 	global.prisma ||
 	new PrismaClient({
-		// log: process.env.NODE_ENV === 'development' ? ['query', 'error', 'warn'] : ['error'],
+		log: process.env.NODE_ENV === 'development' ? ['query', 'error', 'warn'] : ['error'],
 	})
 
 if (process.env.NODE_ENV !== 'production') {

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -33,7 +33,7 @@
 		"with-env": "dotenv -e ../../.env --"
 	},
 	"dependencies": {
-		"@prisma/client": "4.7.0",
+		"@prisma/client": "4.7.1",
 		"prisma-docs-generator": "0.5.0",
 		"zod": "3.19.1"
 	},
@@ -65,7 +65,7 @@
 		"listr2": "5.0.5",
 		"luxon": "3.1.0",
 		"mongoback": "3.0.3",
-		"prisma": "4.7.0",
+		"prisma": "4.7.1",
 		"prisma-dbml-generator": "0.10.0",
 		"quicktype-core": "6.1.0",
 		"recursive-readdir": "2.2.3",

diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
@@ -1,9 +1,10 @@
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["fieldReference", "postgresqlExtensions", "clientExtensions", "filteredRelationCount", "multiSchema"]
-  // output          = "../../../node_modules/.prisma/client"
-  // output          = "../node_modules/.prisma/client"
-  binaryTargets   = ["native", "rhel-openssl-1.0.x"]
+  // clientExtensions causing error
+  // previewFeatures = ["fieldReference", "postgresqlExtensions", "filteredRelationCount", "multiSchema", "clientExtensions"]
+  previewFeatures = ["fieldReference", "postgresqlExtensions", "filteredRelationCount", "multiSchema"]
+
+  binaryTargets = ["native", "rhel-openssl-1.0.x"]
 }
 
 // generator docs {

diff --git a/packages/db/seed/data/03-ethnicity.ts b/packages/db/seed/data/03-ethnicity.ts
@@ -1,10 +1,8 @@
-import { Prisma, UserEthnicity } from '~/client'
 import { prisma } from '~/index'
 
 import { logFile } from '../logger'
 import { ListrTask } from '../starterData'
-import { keySlug } from './00-namespaces'
-import { translationNamespace } from './01-user'
+import { keySlug, namespaces } from './00-namespaces'
 
 type EthnicityData = string[]
 
@@ -23,46 +21,39 @@ const ethnicityData: EthnicityData = [
 ]
 
 export const generateEthnicityRecords = (task: ListrTask) => {
-	const queue: Prisma.Prisma__UserEthnicityClient<Partial<UserEthnicity>>[] = []
-	let i = 1
-	for (const item of ethnicityData) {
-		const transaction: Prisma.Prisma__UserEthnicityClient<Partial<UserEthnicity>> =
-			prisma.userEthnicity.upsert({
-				where: {
-					ethnicity: item,
-				},
-				create: {
-					ethnicity: item,
-					key: {
-						create: {
-							key: `eth-${keySlug(item)}`,
-							text: item,
-							namespace: {
-								connect: {
-									name: translationNamespace,
-								},
+	const queue = ethnicityData.map((item, i) => {
+		const logMessage = `(${i}/${ethnicityData.length}) Added Ethnicity transaction to queue: ${item}`
+		logFile.log(logMessage)
+		task.output = logMessage
+
+		return prisma.userEthnicity.upsert({
+			where: {
+				ethnicity: item,
+			},
+			create: {
+				ethnicity: item,
+				key: {
+					create: {
+						key: `eth-${keySlug(item)}`,
+						text: item,
+						namespace: {
+							connect: {
+								name: namespaces.user,
 							},
 						},
 					},
 				},
-				update: {
-					key: {
-						update: {
-							key: `eth-${keySlug(item)}`,
-							text: item,
-						},
+			},
+			update: {
+				key: {
+					update: {
+						key: `eth-${keySlug(item)}`,
+						text: item,
 					},
 				},
-				select: {
-					id: true,
-				},
-			})
+			},
+		})
+	})
 
-		queue.push(transaction)
-		const logMessage = `(${i}/${ethnicityData.length}) Added Ethnicity transaction to queue: ${item}`
-		logFile.log(logMessage)
-		task.output = logMessage
-		i++
-	}
 	return queue
 }
diff --git a/packages/db/seed/starter/01-user.ts b/packages/db/seed/starter/01-user.ts
@@ -1,12 +1,10 @@
-import { UserRole } from '@prisma/client'
 import slugify from 'slugify'
 
-import { Prisma } from '~/client'
 import { prisma } from '~/index'
 import { namespaces } from '~/seed/data'
 import { ListrTask } from '~/seed/starterData'
 
-import { seedUser, userEmail, userRoleList } from '../data/01-user'
+import { seedUser, userEmail, userRoleList } from '../data'
 import { logFile } from '../logger'
 
 export const seedSystemUser = async (task: ListrTask) => {
@@ -77,7 +75,7 @@ export const seedUserTypes = async (task: ListrTask) => {
 export const seedUserRoles = async (task: ListrTask) => {
 	let logMessage = ``
 	let countA = 1
-	const bulkTransactions: Prisma.Prisma__UserRoleClient<UserRole>[] = userRoleList.map((role) => {
+	const bulkTransactions = userRoleList.map((role) => {
 		logMessage = `(${countA}/${userRoleList.length}) Upserting User Role: ${role.name}`
 		logFile.info(logMessage)
 		task.output = logMessage

diff --git a/packages/db/seed/starter/12-geodata.ts b/packages/db/seed/starter/12-geodata.ts
@@ -202,9 +202,6 @@ const countryUS = async (task: ListrTask) => {
 						parent: connectTo(stateId),
 						key,
 					},
-					select: {
-						id: true,
-					},
 				})
 			)
 			countA++

diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json
@@ -6,8 +6,7 @@
 		"baseUrl": ".",
 		"paths": {
 			"~/*": ["./*"]
-		},
-		"declaration": true
+		}
 	},
-	"include": ["index.ts", "data-transfer", "seed", "zod-schemas", "zod-util"]
+	"include": ["index.ts", "datastore", "seed", "zod-schemas", "zod-util"]
 }
diff --git a/packages/db/tsup.config.ts b/packages/db/tsup.config.ts