Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ jobs:
matrix:
database:
- mongodb
- documentdb
- cosmosdb
- firestore
- postgres
- postgres-custom-schema
Expand Down
5 changes: 5 additions & 0 deletions packages/payload/src/database/getLocalizedPaths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ export function getLocalizedPaths({
case 'json':
case 'richText': {
const upcomingSegments = pathSegments.slice(i + 1).join('.')
pathSegments.forEach((path) => {
if (!/^\w+(?:\.\w+)*$/.test(path)) {
lastIncompletePath.invalid = true
}
})
lastIncompletePath.complete = true
lastIncompletePath.path = upcomingSegments
? `${currentPath}.${upcomingSegments}`
Expand Down
37 changes: 24 additions & 13 deletions test/generateDatabaseAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import { fileURLToPath } from 'node:url'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)

export const allDatabaseAdapters = {
mongodb: `
import { mongooseAdapter } from '@payloadcms/db-mongodb'

export const databaseAdapter = mongooseAdapter({
const mongooseAdapterArgs = `
ensureIndexes: true,
// required for connect to detect that we are using a memory server
mongoMemoryServer: global._mongoMemoryServer,
Expand All @@ -20,23 +16,38 @@ export const allDatabaseAdapters = {
collation: {
strength: 1,
},
`

export const allDatabaseAdapters = {
mongodb: `
import { mongooseAdapter } from '@payloadcms/db-mongodb'

export const databaseAdapter = mongooseAdapter({
${mongooseAdapterArgs}
})`,
cosmosdb: `
import { mongooseAdapter, compatibilityOptions } from '@payloadcms/db-mongodb'

export const databaseAdapter = mongooseAdapter({
...compatibilityOptions.cosmosdb,
${mongooseAdapterArgs}
})`,
documentdb: `
import { mongooseAdapter, compatibilityOptions } from '@payloadcms/db-mongodb'

export const databaseAdapter = mongooseAdapter({
...compatibilityOptions.documentdb,
${mongooseAdapterArgs}
})`,
firestore: `
import { mongooseAdapter, compatibilityOptions } from '@payloadcms/db-mongodb'

export const databaseAdapter = mongooseAdapter({
...compatibilityOptions.firestore,
url:
process.env.DATABASE_URI ||
process.env.MONGODB_MEMORY_SERVER_URI ||
'mongodb://127.0.0.1/payloadtests',
collation: {
strength: 1,
},
${mongooseAdapterArgs}
// The following options prevent some tests from failing.
// More work needed to get tests succeeding without these options.
ensureIndexes: true,
transactionOptions: {},
disableIndexHints: false,
useAlternativeDropDatabase: false,
})`,
Expand Down
Loading