From 4827aa59b1253deee3fd6104eb6805d6085a4a74 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:50:00 +0800 Subject: [PATCH 1/2] fix: add missing parameters to `@db.Decimal` --- packages/schema/src/res/stdlib.zmodel | 2 +- .../schema/tests/schema/validation/attribute-validation.test.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/schema/src/res/stdlib.zmodel b/packages/schema/src/res/stdlib.zmodel index 3255c3b2e..924befbc0 100644 --- a/packages/schema/src/res/stdlib.zmodel +++ b/packages/schema/src/res/stdlib.zmodel @@ -281,7 +281,7 @@ attribute @db.Int8() @@@targetField([BigIntField]) @@@prisma attribute @db.DoublePrecision() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Real() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Float() @@@targetField([FloatField, DecimalField]) @@@prisma -attribute @db.Decimal() @@@targetField([FloatField, DecimalField]) @@@prisma +attribute @db.Decimal(_ p: Int?, s: Int?) @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Double() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Money() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.SmallMoney() @@@targetField([FloatField, DecimalField]) @@@prisma diff --git a/packages/schema/tests/schema/validation/attribute-validation.test.ts b/packages/schema/tests/schema/validation/attribute-validation.test.ts index 9d9fd30cb..78257d021 100644 --- a/packages/schema/tests/schema/validation/attribute-validation.test.ts +++ b/packages/schema/tests/schema/validation/attribute-validation.test.ts @@ -304,6 +304,7 @@ describe('Attribute tests', () => { model _FloatDecimal { _float Float @db.Float _decimal Decimal @db.Decimal + _decimal1 Decimal @db.Decimal(10, 2) _doublePrecision Float @db.DoublePrecision _real Float @db.Real _double Float @db.Double From 46a3396a0fe2364c999ee482e7333a1a6a36f4ba Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Thu, 8 Jun 2023 15:40:43 +0800 Subject: [PATCH 2/2] update --- packages/schema/src/res/stdlib.zmodel | 4 ++-- .../tests/schema/validation/attribute-validation.test.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/schema/src/res/stdlib.zmodel b/packages/schema/src/res/stdlib.zmodel index 924befbc0..7ca1426ae 100644 --- a/packages/schema/src/res/stdlib.zmodel +++ b/packages/schema/src/res/stdlib.zmodel @@ -281,7 +281,7 @@ attribute @db.Int8() @@@targetField([BigIntField]) @@@prisma attribute @db.DoublePrecision() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Real() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Float() @@@targetField([FloatField, DecimalField]) @@@prisma -attribute @db.Decimal(_ p: Int?, s: Int?) @@@targetField([FloatField, DecimalField]) @@@prisma +attribute @db.Decimal(_ p: Int?, _ s: Int?) @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Double() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.Money() @@@targetField([FloatField, DecimalField]) @@@prisma attribute @db.SmallMoney() @@@targetField([FloatField, DecimalField]) @@@prisma @@ -290,7 +290,7 @@ attribute @db.Float4() @@@targetField([FloatField, DecimalField]) @@@prisma // DateTime type modifiers -attribute @db.DateTime(x: Int?) @@@targetField([DateTimeField]) @@@prisma +attribute @db.DateTime(_ x: Int?) @@@targetField([DateTimeField]) @@@prisma attribute @db.DateTime2() @@@targetField([DateTimeField]) @@@prisma attribute @db.SmallDateTime() @@@targetField([DateTimeField]) @@@prisma attribute @db.DateTimeOffset() @@@targetField([DateTimeField]) @@@prisma diff --git a/packages/schema/tests/schema/validation/attribute-validation.test.ts b/packages/schema/tests/schema/validation/attribute-validation.test.ts index 78257d021..f80aa1cd9 100644 --- a/packages/schema/tests/schema/validation/attribute-validation.test.ts +++ b/packages/schema/tests/schema/validation/attribute-validation.test.ts @@ -1,3 +1,5 @@ +/// + import { loadModel, loadModelWithError } from '../../utils'; describe('Attribute tests', () => {