Merge pull request #24 from better/refs

Support more generic $refs

Author: erikbern

jsonschema2db.py

@@ -109,17 +109,16 @@ def _traverse(self, schema, tree, path=tuple(), table='root', parent=None, comme
         definition = None
         new_json_path = json_path
         while '$ref' in tree:
-            p = tree['$ref'].lstrip('#').lstrip('/').split('/')
-            # TODO: I actually don't think it's required JSON schema that all definitions have to go under #/definitions
-            if len(p) != 2 and p[0] != 'definitions':
-                warnings.warn('%s.%s: Broken reference: %s' % (table, self._column_name(path), tree['$ref']))
-                return
-            _, definition = p
-            if definition not in schema['definitions']:
-                warnings.warn('%s.%s: Broken definition: %s' % (table, self._column_name(path), definition))
-                return
-            tree = schema['definitions'][definition]
-            new_json_path = ('#', 'definitions', definition)
+            ref = tree['$ref']
+            p = ref.lstrip('#').lstrip('/').split('/')
+            tree = schema
+            for elem in p:
+                if elem not in tree:
+                    warnings.warn('%s.%s: Broken definition: %s' % (table, self._column_name(path), ref))
+                    return
+                tree = tree[elem]
+            new_json_path = ('#',) + tuple(p)
+            definition = p[-1]  # TODO(erikbern): we should just make this a boolean variable
 
         special_keys = set(tree.keys()).intersection(['oneOf', 'allOf', 'anyOf'])
         if special_keys:
@@ -137,6 +136,7 @@ def _traverse(self, schema, tree, path=tuple(), table='root', parent=None, comme
             res = {}
             warnings.warn('%s.%s: Type info missing' % (table, self._column_name(path)))
         elif tree['type'] == 'object':
+            print('object:', tree)
             res = {}
             if 'patternProperties' in tree:
                 # Always create a new table for the pattern properties

test/test.py

@@ -109,3 +109,12 @@ def test_time_types():
         [(1, datetime.date(2018, 7, 8)), (2, datetime.date(2013, 3, 2))]
     assert list((id, ts.isoformat()) for id, ts in query(con, 'select id, ts from root')) == \
         [(1, '2018-02-03T12:45:56+00:00'), (2, '2017-02-03T01:23:45+00:00')]
+
+
+def test_refs():
+    schema = json.load(open('test/test_refs.json'))
+    translator = JSONSchemaToPostgres(schema, debug=True)
+
+    con = psycopg2.connect('host=localhost dbname=jsonschema2db-test')
+    translator.create_tables(con)
+    assert list(query(con, 'select col from c')) == []  # Just make sure table exists

test/test_refs.json

@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/schema#",
+    "type": "object",
+    "a": {
+        "b": {
+            "c": {
+                "type": "object",
+                "properties": {
+                    "col": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    },
+    "x": {
+        "y": {
+            "z": {
+                "$ref": "#/a/b/c"
+            }
+        }
+    },
+    "properties": {
+        "banana": {
+	    "$ref": "#/x/y/z"
+        }
+    }
+}