From e20ac0e277f045def21c33c7f3033babecad0f30 Mon Sep 17 00:00:00 2001 From: roll Date: Tue, 24 Sep 2024 14:03:42 +0100 Subject: [PATCH 1/2] Fixed `schema.fieldsMatch` --- content/docs/overview/changelog.md | 4 ++++ profiles/source/dictionary/schema.yaml | 18 ++++++++---------- profiles/target/2.1/datapackage.json | 21 +++++++++------------ profiles/target/2.1/dataresource.json | 21 +++++++++------------ profiles/target/2.1/tableschema.json | 21 +++++++++------------ 5 files changed, 39 insertions(+), 46 deletions(-) diff --git a/content/docs/overview/changelog.md b/content/docs/overview/changelog.md index 3c30b23e..7809ee54 100644 --- a/content/docs/overview/changelog.md +++ b/content/docs/overview/changelog.md @@ -8,6 +8,10 @@ This document includes all meaningful changes made to the **Data Package standar ## v2.1 +##### `schema.fieldsMatch` (fixed) + +The `schema.fieldsMatch` property definition has been fixed in the Table Schema profile ([#965](https://github.com/frictionlessdata/datapackage/issues/965)). + ## v2.0 This release includes a rich set of specification improvements to make Data Package a finished product (see [announcement](https://frictionlessdata.io/blog/2023/11/15/frictionless-specs-update/)). All changes were reviewed and accepted by the Data Package Working Group. diff --git a/profiles/source/dictionary/schema.yaml b/profiles/source/dictionary/schema.yaml index e25c9663..92ebe1f5 100644 --- a/profiles/source/dictionary/schema.yaml +++ b/profiles/source/dictionary/schema.yaml @@ -123,16 +123,14 @@ tableSchemaField: - "$ref": "#/definitions/tableSchemaFieldDuration" - "$ref": "#/definitions/tableSchemaFieldAny" tableSchemaFieldsMatch: - type: array - item: - type: string - enum: - - exact - - equal - - subset - - superset - - partial - default: exact + type: string + enum: + - exact + - equal + - subset + - superset + - partial + default: exact tableSchemaPrimaryKey: oneOf: - type: array diff --git a/profiles/target/2.1/datapackage.json b/profiles/target/2.1/datapackage.json index 686dcad7..8562a52e 100644 --- a/profiles/target/2.1/datapackage.json +++ b/profiles/target/2.1/datapackage.json @@ -2938,18 +2938,15 @@ ] }, "fieldsMatch": { - "type": "array", - "item": { - "type": "string", - "enum": [ - "exact", - "equal", - "subset", - "superset", - "partial" - ], - "default": "exact" - } + "type": "string", + "enum": [ + "exact", + "equal", + "subset", + "superset", + "partial" + ], + "default": "exact" }, "primaryKey": { "oneOf": [ diff --git a/profiles/target/2.1/dataresource.json b/profiles/target/2.1/dataresource.json index efeaec10..eea784d4 100644 --- a/profiles/target/2.1/dataresource.json +++ b/profiles/target/2.1/dataresource.json @@ -2702,18 +2702,15 @@ ] }, "fieldsMatch": { - "type": "array", - "item": { - "type": "string", - "enum": [ - "exact", - "equal", - "subset", - "superset", - "partial" - ], - "default": "exact" - } + "type": "string", + "enum": [ + "exact", + "equal", + "subset", + "superset", + "partial" + ], + "default": "exact" }, "primaryKey": { "oneOf": [ diff --git a/profiles/target/2.1/tableschema.json b/profiles/target/2.1/tableschema.json index f3a76baa..2d2542f2 100644 --- a/profiles/target/2.1/tableschema.json +++ b/profiles/target/2.1/tableschema.json @@ -2268,18 +2268,15 @@ ] }, "fieldsMatch": { - "type": "array", - "item": { - "type": "string", - "enum": [ - "exact", - "equal", - "subset", - "superset", - "partial" - ], - "default": "exact" - } + "type": "string", + "enum": [ + "exact", + "equal", + "subset", + "superset", + "partial" + ], + "default": "exact" }, "primaryKey": { "oneOf": [ From db5f8be2661ade0e6a80d77a5e16bacbb4c66779 Mon Sep 17 00:00:00 2001 From: Peter Desmet Date: Tue, 24 Sep 2024 15:32:17 +0200 Subject: [PATCH 2/2] Rephrase cf. rest of Changelog --- content/docs/overview/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/overview/changelog.md b/content/docs/overview/changelog.md index 7809ee54..5655b2b6 100644 --- a/content/docs/overview/changelog.md +++ b/content/docs/overview/changelog.md @@ -10,7 +10,7 @@ This document includes all meaningful changes made to the **Data Package standar ##### `schema.fieldsMatch` (fixed) -The `schema.fieldsMatch` property definition has been fixed in the Table Schema profile ([#965](https://github.com/frictionlessdata/datapackage/issues/965)). +[fieldsMatch](/standard/table-schema/#fieldsMatch) has been corrected from array to string to match its definition ([#965](https://github.com/frictionlessdata/datapackage/issues/965)). ## v2.0