Merge pull request #28 from ewdurbin/main

Fix enum collision

Author: Vanderhoof

pydbml/database.py

@@ -118,8 +118,8 @@ def add_enum(self, obj: Enum) -> Enum:
         if obj in self.enums:
             raise DatabaseValidationError(f'{obj} is already in the database.')
         for enum in self.enums:
-            if enum.name == obj.name:
-                raise DatabaseValidationError(f'Enum {obj.name} is already in the database.')
+            if enum.name == obj.name and enum.schema == obj.schema:
+                raise DatabaseValidationError(f'Enum {obj.schema}.{obj.name} is already in the database.')
 
         self._set_database(obj)
         self.enums.append(obj)

test/test_data/dbml_schema_def.dbml

@@ -0,0 +1,64 @@
+Table "ecommerce"."users" as EU {
+  id int [pk]
+  name varchar
+  ejs job_status
+  ejs2 public.job_status
+  eg schemaB.gender
+  eg2 gender
+}
+
+Table public.users {
+  id int [pk]
+  name varchar
+  pjs job_status
+  pjs2 public.job_status
+  pg schemaB.gender
+  pg2 gender
+}
+
+Table products {
+  id int [pk]
+  name varchar
+}
+
+Table schemaA.products as A {
+  id int [pk]
+  name varchar [ref: > EU.id]
+}
+
+Table schemaA.locations {
+  id int [pk]
+  name varchar [ref: > users.id ]
+}
+
+Ref: "public".users.id < EU.id
+
+Ref name_optional {
+  users.name < ecommerce.users.id
+}
+
+TableGroup tablegroup_name { // tablegroup is case-insensitive.
+  public.products
+  users
+  ecommerce.users
+  A
+}
+
+enum job_status {
+    created2 [note: 'abcdef']
+    running2
+    done2
+    failure2
+}
+
+enum schemaB.gender {
+    man
+    woman
+    nonbinary
+}
+
+enum gender {
+    man2
+    woman2
+    nonbinary2
+}

test/test_parser.py

@@ -106,6 +106,15 @@ def test_composite_references(self):
         self.assertEqual(rs[1].col2, [reviews2['post_id'], reviews2['tag']])
 
 
+class TestDBMLReferenceDef(TestCase):
+    def test_dbml_reference_def(self):
+        results = PyDBML.parse_file(TEST_DATA_PATH / 'dbml_schema_def.dbml')
+        self.assertEqual(len(results.aliases), 1)
+        self.assertEqual(len(results.tables), 5)
+        self.assertEqual(len(results.table_groups), 1)
+        self.assertEqual(len(results.enums), 3)
+
+
 class TestFaulty(TestCase):
     def test_bad_reference(self) -> None:
         with self.assertRaises(TableNotFoundError):