fix conflicts after refactoring

Author: vrathee-msft

src/PowerPlatform/Dataverse/data/_odata.py

@@ -13,6 +13,7 @@
 import unicodedata
 import time
 import json
+import re
 import warnings
 from datetime import datetime, timezone
 
@@ -2164,47 +2165,17 @@ def _build_lookup_field_models(
         cascade_delete: str = CASCADE_BEHAVIOR_REMOVE_LINK,
         language_code: int = 1033,
     ) -> tuple:
-        """Build a (lookup, relationship) pair for a lookup field creation.
-
-        Returns ``(LookupAttributeMetadata, OneToManyRelationshipMetadata)``.
-        Used by both the batch resolver and ``TableOperations.create_lookup_field``
-        to avoid duplicating the metadata assembly logic.
-
-        Note: ``referencing_table`` and ``referenced_table`` are lowercased
-        automatically because Dataverse stores entity logical names in
-        lowercase.  ``lookup_field_name`` is kept as-is (it is a SchemaName).
-        """
-        # Dataverse logical names are always lowercase.  Callers may pass
-        # SchemaName-cased values (e.g. "new_SQLTeam"); normalise here so
-        # the relationship metadata uses valid logical names.
-        referencing_lower = referencing_table.lower()
-        referenced_lower = referenced_table.lower()
-
-        lookup = LookupAttributeMetadata(
-            schema_name=lookup_field_name,
-            display_name=Label(
-                localized_labels=[
-                    LocalizedLabel(
-                        label=display_name or referenced_table,
-                        language_code=language_code,
-                    )
-                ]
-            ),
-            required_level="ApplicationRequired" if required else "None",
-        )
-        if description:
-            lookup.description = Label(
-                localized_labels=[LocalizedLabel(label=description, language_code=language_code)]
-            )
-        rel_name = f"{referenced_lower}_{referencing_lower}_{lookup_field_name}"
-        relationship = OneToManyRelationshipMetadata(
-            schema_name=rel_name,
-            referenced_entity=referenced_lower,
-            referencing_entity=referencing_lower,
-            referenced_attribute=f"{referenced_lower}id",
-            cascade_configuration=CascadeConfiguration(delete=cascade_delete),
+        """Delegate to the base implementation (kept here for subclass discoverability)."""
+        return _ODataBase._build_lookup_field_models(
+            referencing_table,
+            lookup_field_name,
+            referenced_table,
+            display_name=display_name,
+            description=description,
+            required=required,
+            cascade_delete=cascade_delete,
+            language_code=language_code,
         )
-        return lookup, relationship
 
     def _build_create_relationship(
         self,