Merge branch 'feat/db-adapters' of github.com:payloadcms/payload into feat/db-adapters

packages/db-postgres/package.json

@@ -10,8 +10,7 @@
     "build": "tsc"
   },
   "peerDependencies": {
-    "better-sqlite3": "^8.5.0",
-    "payload": "^1.12.0"
+    "better-sqlite3": "^8.5.0"
   },
   "dependencies": {
     "@libsql/client": "^0.3.1",
@@ -25,7 +24,7 @@
     "@types/pg": "^8.10.2",
     "@types/to-snake-case": "^1.0.0",
     "better-sqlite3": "^8.5.0",
-    "payload": "^1.12.0",
+    "payload": "payloadcms/payload#build/chore/update-2.0",
     "typescript": "^4.9.4"
   }
 }

packages/db-postgres/src/init.ts

@@ -9,7 +9,9 @@ export const init: Init = async function init(this: PostgresAdapter) {
   if (this.payload.config.localization) {
     this.enums._locales = pgEnum(
       '_locales',
-      this.payload.config.localization.locales as [string, ...string[]],
+      // TODO: types out of sync with core, monorepo please
+      // this.payload.config.localization.localeCodes,
+      (this.payload.config.localization.locales as unknown as {code: string}[]).map(({ code }) => code) as [string, ...string[]],
     );
   }
 

packages/db-postgres/src/queries/buildSearchParams.ts

@@ -3,7 +3,9 @@ import { inArray } from 'drizzle-orm';
 import { a as SQL } from 'drizzle-orm/column.d-aa4e525d';
 import { getLocalizedPaths } from 'payload/dist/database/getLocalizedPaths';
 import { Field, fieldAffectsData } from 'payload/dist/fields/config/types';
-import { PathToQuery, validOperators } from 'payload/dist/database/queryValidation/types';
+import { PathToQuery } from 'payload/dist/database/queryValidation/types';
+import { validOperators } from 'payload/dist/types/constants';
+import { Operator } from 'payload/types';
 import { operatorMap } from './operatorMap';
 import { PostgresAdapter } from '../types';
 
@@ -177,7 +179,7 @@ export async function buildSearchParam({
       return relationshipQuery;
     }
 
-    if (operator && validOperators.includes(operator)) {
+    if (operator && validOperators.includes(operator as Operator)) {
       const operatorKey = operatorMap[operator];
 
       if (field.type === 'relationship' || field.type === 'upload') {

packages/db-postgres/src/queries/parseParams.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-await-in-loop */
-import { Where } from 'payload/types';
+import { Operator, Where } from 'payload/types';
 import { Field } from 'payload/dist/fields/config/types';
-import { validOperators } from 'payload/dist/database/queryValidation/types';
+import { validOperators } from 'payload/dist/types/constants';
 import { and, SQL } from 'drizzle-orm';
 import { buildSearchParam } from './buildSearchParams';
 import { buildAndOrConditions } from './buildAndOrConditions';
@@ -53,7 +53,7 @@ export async function parseParams({
         const pathOperators = where[relationOrPath];
         if (typeof pathOperators === 'object') {
           for (const operator of Object.keys(pathOperators)) {
-            if (validOperators.includes(operator)) {
+            if (validOperators.includes(operator as Operator)) {
               const searchParam = await buildSearchParam({
                 collectionSlug,
                 globalSlug,