From 837112c5f9742b9e63a969cdaa46ddb20f80dcde Mon Sep 17 00:00:00 2001
From: Nokome Bentley <nokome@stenci.la>
Date: Mon, 15 Apr 2019 15:32:17 +1200
Subject: [PATCH] fix: changes to Datatable and related schemas

---
 schema/Collection.schema.yaml                 | 5 ++++-
 schema/data/DatatableColumn.schema.yaml       | 4 ----
 schema/data/DatatableColumnSchema.schema.yaml | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/schema/Collection.schema.yaml b/schema/Collection.schema.yaml
index f14acc1fba..7ec9ab51b9 100644
--- a/schema/Collection.schema.yaml
+++ b/schema/Collection.schema.yaml
@@ -8,6 +8,9 @@ properties:
     '@id': schema:hasParts
     type: array
     items:
-      $ref: CreativeWork.schema.yaml
+      anyOf:
+        - $ref: Article.schema.yaml
+        - $ref: Datatable.schema.yaml
+        - $ref: Table.schema.yaml
 required:
   - parts
diff --git a/schema/data/DatatableColumn.schema.yaml b/schema/data/DatatableColumn.schema.yaml
index ad81c80ca5..0d0cf6fbfb 100644
--- a/schema/data/DatatableColumn.schema.yaml
+++ b/schema/data/DatatableColumn.schema.yaml
@@ -4,10 +4,6 @@ $extends: ../Thing.schema.yaml
 role: secondary
 status: experimental
 properties:
-  name:
-    description: Name of the column.
-    allOf:
-      - $ref: name.schema.yaml
   meta:
     description: Metadata for the column.
     type: object
diff --git a/schema/data/DatatableColumnSchema.schema.yaml b/schema/data/DatatableColumnSchema.schema.yaml
index 392042ab3e..fca31362b3 100644
--- a/schema/data/DatatableColumnSchema.schema.yaml
+++ b/schema/data/DatatableColumnSchema.schema.yaml
@@ -6,8 +6,8 @@ status: experimental
 properties:
   items:
     type: object
-    allOf:
-      - $ref: json-schema-draft-07.schema.json
   uniqueItems:
     type: boolean
     default: false
+required:
+  - items
\ No newline at end of file