Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: remove referentialIntegrity flag #16395

Merged
merged 7 commits into from
Nov 24, 2022
Merged

test: remove referentialIntegrity flag #16395

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0526c63
test: remove `referentialIntegrity` flag
Jolg42 Nov 22, 2022
67b7917
fix computeSchema
Jolg42 Nov 22, 2022
20d2216
Merge branch 'main' into joel/referentialIntegrity-GA
Jolg42 Nov 23, 2022
64f80cd
remove forgotten previewFeatures from some tests
Jolg42 Nov 24, 2022
1522950
fix example
Jolg42 Nov 24, 2022
5bbe192
revert example
Jolg42 Nov 24, 2022
d971dfa
Update packages/client/tests/functional/_example/_matrix.ts
Jolg42 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/client/tests/functional/_example/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default defineMatrix(() => [
],
[
{
previewFeatures: '"interactiveTransactions"',
previewFeatures: '"referentialIntegrity"',
Jolg42 marked this conversation as resolved.
Show resolved Hide resolved
},
{
previewFeatures: '"referentialIntegrity"',
Expand All @@ -51,25 +51,25 @@ export default defineMatrix(() => [
'provider': 'sqlite',
'id': 'Int @id @default(autoincrement())',
'providerFeatures': '',
'previewFeatures': '"interactiveTransactions"',
'previewFeatures': '"previewFeatureFlag1"',
},
{
'provider': 'mongodb',
'id': 'String @id @default(auto()) @map("_id") @db.ObjectId',
'providerFeatures': '"mongoDb", ',
'previewFeatures': '"interactiveTransactions"',
'previewFeatures': '"previewFeatureFlag1"',
},
{
'provider': 'sqlite',
'id': 'Int @id @default(autoincrement())',
'providerFeatures': '',
'previewFeatures': '"referentialIntegrity"',
'previewFeatures': '"previewFeatureFlag2"',
},
{
'provider': 'mongodb',
'id': 'String @id @default(auto()) @map("_id") @db.ObjectId',
'providerFeatures': '"mongoDb", ',
'previewFeatures': '"referentialIntegrity"',
'previewFeatures': '"previewFeatureFlag2"',
},
]
*/
6 changes: 3 additions & 3 deletions packages/client/tests/functional/_utils/relationMode/computeSchemaHeader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import type { ProviderFlavor } from './ProviderFlavor'

export type ComputeSchemaHeader = {
provider: Providers
providerFlavor: ProviderFlavor
previewFeatures: string
relationMode: string
providerFlavor?: ProviderFlavor
previewFeatures?: string
}

export function computeSchemaHeader({
Expand All @@ -28,7 +28,7 @@ export function computeSchemaHeader({
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = [${previewFeatures}]
${previewFeatures ? `previewFeatures = ["${previewFeatures}"]` : ''}
}

datasource db {
Expand Down
5 changes: 0 additions & 5 deletions packages/client/tests/functional/issues/10000/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,4 @@ export default defineMatrix(() => [
},
*/
],
[
{
previewFeatures: '"referentialIntegrity"',
},
],
])
3 changes: 1 addition & 2 deletions packages/client/tests/functional/issues/10000/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Providers } from '../../../_utils/providers'
import testMatrix from '../_matrix'

export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode, referentialActions }) => {
export default testMatrix.setupSchema(({ provider, relationMode, referentialActions }) => {
// if relationMode is not defined, we do not add the line
// if relationMode is defined
// we add the line only if the provider is not MongoDB, since MongoDB doesn't need the setting, it's on by default
Expand All @@ -10,7 +10,6 @@ export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = [${previewFeatures}]
}

datasource db {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/tests/functional/issues/11974/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default testMatrix.setupSchema(({ provider }) => {
return /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = ["referentialIntegrity", "interactiveTransactions"]
previewFeatures = ["interactiveTransactions"]
}

datasource db {
Expand Down
5 changes: 0 additions & 5 deletions packages/client/tests/functional/issues/12378/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,4 @@ export default defineMatrix(() => [
relationMode,
},
],
[
{
previewFeatures: '"referentialIntegrity"',
},
],
])
3 changes: 1 addition & 2 deletions packages/client/tests/functional/issues/12378/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Providers } from '../../../_utils/providers'
import testMatrix from '../_matrix'

export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode }) => {
export default testMatrix.setupSchema(({ provider, relationMode }) => {
// if relationMode is not defined, we do not add the line
// if relationMode is defined
// we add the line only if the provider is not MongoDB, since MongoDB doesn't need the setting, it's on by default
Expand All @@ -10,7 +10,6 @@ export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = [${previewFeatures}]
}

datasource db {
Expand Down
5 changes: 0 additions & 5 deletions packages/client/tests/functional/issues/12557/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,4 @@ export default defineMatrix(() => [
relationMode,
},
],
[
{
previewFeatures: '"referentialIntegrity"',
},
],
])
3 changes: 1 addition & 2 deletions packages/client/tests/functional/issues/12557/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Providers } from '../../../_utils/providers'
import testMatrix from '../_matrix'

export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode }) => {
export default testMatrix.setupSchema(({ provider, relationMode }) => {
// if relationMode is not defined, we do not add the line
// if relationMode is defined
// we add the line only if the provider is not MongoDB, since MongoDB doesn't need the setting, it's on by default
Expand All @@ -10,7 +10,6 @@ export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = [${previewFeatures}]
}

datasource db {
Expand Down
1 change: 0 additions & 1 deletion packages/client/tests/functional/issues/13766/at-unique/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export default testMatrix.setupSchema(({ provider }) => {
return /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = ["referentialIntegrity"]
}

datasource db {
Expand Down
1 change: 0 additions & 1 deletion packages/client/tests/functional/issues/13766/primary-key/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export default testMatrix.setupSchema(({ provider }) => {
return /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = ["referentialIntegrity"]
}

datasource db {
Expand Down
5 changes: 0 additions & 5 deletions packages/client/tests/functional/issues/14271/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,4 @@ export default defineMatrix(() => [
},
*/
],
[
{
previewFeatures: '"referentialIntegrity"',
},
],
])
3 changes: 1 addition & 2 deletions packages/client/tests/functional/issues/14271/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Providers } from '../../../_utils/providers'
import { computeReferentialActionLine } from '../../../_utils/relationMode/computeReferentialActionLine'
import testMatrix from '../_matrix'

export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode, referentialActions }) => {
export default testMatrix.setupSchema(({ provider, relationMode, referentialActions }) => {
// if relationMode is not defined, we do not add the line
// if relationMode is defined
// we add the line only if the provider is not MongoDB, since MongoDB doesn't need the setting, it's on by default
Expand All @@ -11,7 +11,6 @@ export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = [${previewFeatures}]
}

datasource db {
Expand Down
3 changes: 1 addition & 2 deletions packages/client/tests/functional/referentialIntegrity-property-deprecated/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ export default testMatrix.setupSchema(({ provider }) => {
const schemaHeader = /* Prisma */ `
generator client {
provider = "prisma-client-js"
previewFeatures = ["referentialIntegrity"]
}

datasource db {
provider = "${provider}"
url = env("DATABASE_URI_${provider}")
// We are testing that this is stil valid:
// We are testing that this is still valid:
referentialIntegrity = "prisma"
}
`
Expand Down
5 changes: 0 additions & 5 deletions packages/client/tests/functional/relationMode-m-n-mongodb-failing-with-at-map/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,4 @@ export default defineMatrix(() => [
onDelete: 'SetNull',
},
],
[
{
previewFeatures: '"referentialIntegrity"',
},
],
])
4 changes: 2 additions & 2 deletions ...es/client/tests/functional/relationMode-m-n-mongodb-failing-with-at-map/prisma/_schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { computeSchemaHeader } from '../../_utils/relationMode/computeSchemaHead
import testMatrix from '../_matrix'
import { schema_mton } from './_schema_m_to_n'

export default testMatrix.setupSchema(({ provider, previewFeatures, relationMode, onUpdate, onDelete, id }) => {
const schemaHeader = computeSchemaHeader({ provider, previewFeatures, relationMode })
export default testMatrix.setupSchema(({ provider, relationMode, onUpdate, onDelete, id }) => {
const schemaHeader = computeSchemaHeader({ provider, relationMode })
const referentialActionLineOutput = computeReferentialActionLine({ onUpdate, onDelete })

return /* Prisma */ `
Expand Down
2 changes: 0 additions & 2 deletions packages/client/tests/functional/relationMode/_matrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ export default defineMatrix(() => [
[...defaultMatrix],
[
{
previewFeatures: '"referentialIntegrity"',
isSchemaUsingMap: false,
},
{
previewFeatures: '"referentialIntegrity"',
isSchemaUsingMap: true,
},
],
Expand Down