fixup! Allow constructing ULID from UUID

abhiaagarwal · abhiaagarwal · commit 632f60c843fa · 2025-05-23T16:09:41.000-04:00
diff --git a/tests/test_json_schema.py b/tests/test_json_schema.py
@@ -222,7 +222,12 @@
             {
                 'properties': {
                     'x': {
-                        'anyOf': [{'type': 'integer'}, {'format': 'binary', 'type': 'string'}, {'type': 'string'}],
+                        'anyOf': [
+                            {'type': 'integer'},
+                            {'format': 'binary', 'type': 'string'},
+                            {'type': 'string'},
+                            {'format': 'uuid', 'type': 'string'},
+                        ],
                         'title': 'X',
                     }
                 },
diff --git a/tests/test_ulid.py b/tests/test_ulid.py
@@ -66,7 +66,12 @@ def test_json_schema():
     assert Something.model_json_schema(mode='validation') == {
         'properties': {
             'ulid': {
-                'anyOf': [{'type': 'integer'}, {'format': 'binary', 'type': 'string'}, {'type': 'string'}],
+                'anyOf': [
+                    {'type': 'integer'},
+                    {'format': 'binary', 'type': 'string'},
+                    {'type': 'string'},
+                    {'format': 'uuid', 'type': 'string'},
+                ],
                 'title': 'Ulid',
             }
         },
@@ -77,7 +82,12 @@ def test_json_schema():
     assert Something.model_json_schema(mode='serialization') == {
         'properties': {
             'ulid': {
-                'anyOf': [{'type': 'integer'}, {'format': 'binary', 'type': 'string'}, {'type': 'string'}],
+                'anyOf': [
+                    {'type': 'integer'},
+                    {'format': 'binary', 'type': 'string'},
+                    {'type': 'string'},
+                    {'format': 'uuid', 'type': 'string'},
+                ],
                 'title': 'Ulid',
             }
         },

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,12 @@`
`222`	`222`	`{`
`223`	`223`	`'properties': {`
`224`	`224`	`'x': {`
`225`		`- 'anyOf': [{'type': 'integer'}, {'format': 'binary', 'type': 'string'}, {'type': 'string'}],`
	`225`	`+ 'anyOf': [`
	`226`	`+ {'type': 'integer'},`
	`227`	`+ {'format': 'binary', 'type': 'string'},`
	`228`	`+ {'type': 'string'},`
	`229`	`+ {'format': 'uuid', 'type': 'string'},`
	`230`	`+ ],`
`226`	`231`	`'title': 'X',`
`227`	`232`	`}`
`228`	`233`	`},`