Fix complex base type for type with simple content (#32)

* Fix complex base type
* Add test case

---------

Co-authored-by: cre-os <opensource@cre.fr>

Author: martinv13

src/xml2db/model.py

@@ -545,12 +545,15 @@ def get_occurs(particle):
             or parent_node.type.has_simple_content()
         ):
             if parent_node.type.base_type is not None:
+                parent_base_type = parent_node.type.base_type
+                while parent_base_type.base_type is not None:
+                    parent_base_type = parent_base_type.base_type
                 (
                     data_type,
                     min_length,
                     max_length,
                     allow_empty,
-                ) = recurse_parse_simple_type([parent_node.type.base_type])
+                ) = recurse_parse_simple_type([parent_base_type])
             else:
                 data_type, min_length, max_length, allow_empty = "string", 0, None, True
 

src/xml2db/table/reused_table.py

@@ -1,3 +1,5 @@
+from hashlib import sha1
+
 from sqlalchemy import (
     Table,
     Column,
@@ -10,8 +12,15 @@
     Sequence,
 )
 
-from .transformed_table import DataModelTableTransformed
 from .column import DataModelColumn
+from .transformed_table import DataModelTableTransformed
+
+
+def shorten_str(x: str, max_len: int = 30) -> str:
+    if len(x) > max_len:
+        h = sha1(x.encode("utf8"))
+        return f"{x[:(max_len - 7)]}_{h.hexdigest()[1:6]}"
+    return x
 
 
 class DataModelTableReused(DataModelTableTransformed):
@@ -79,7 +88,7 @@ def get_col(temp=False):
             yield from hash_col.get_sqlalchemy_column(temp)
             yield UniqueConstraint(
                 self.data_model.model_config["record_hash_column_name"],
-                name=f"{prefix if temp else ''}{self.name}_xml2db_record_hash",
+                name=f"{prefix if temp else ''}{shorten_str(self.name)}_xml2db_record_hash",
             )
 
         # build target table

tests/sample_models/orders/base_types.xsd

@@ -36,7 +36,19 @@
     <xs:simpleType name="CoordinatesType">
         <xs:restriction base="xs:float" />
     </xs:simpleType>
-   <xs:simpleType name="CoordinatesListType">
-      <xs:list itemType="bt:CoordinatesType"/>
-   </xs:simpleType>
+    <xs:simpleType name="CoordinatesListType">
+        <xs:list itemType="bt:CoordinatesType"/>
+    </xs:simpleType>
+    <xs:simpleType name="PostalCodeType-base">
+        <xs:restriction base="bt:stringtype">
+            <xs:maxLength value="10"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="PostalCodeType">
+        <xs:simpleContent>
+            <xs:extension base="bt:PostalCodeType-base">
+                <xs:attribute name="codingSystem" type="xs:string" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
 </xs:schema>

tests/sample_models/orders/orders.xsd

@@ -11,16 +11,10 @@
         </xs:choice>
     </xs:complexType>
 
-    <xs:simpleType name="ZipCodeType-base">
-        <xs:restriction base="bt:stringtype">
-            <xs:maxLength value="10"/>
-        </xs:restriction>
-    </xs:simpleType>
-
     <xs:complexType name="ZipCodeType">
         <xs:simpleContent>
-            <xs:extension base="ZipCodeType-base">
-                <xs:attribute name="codingSystem" type="xs:string" use="required"/>
+            <xs:extension base="bt:PostalCodeType">
+                <xs:attribute name="state" type="xs:string"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>

tests/sample_models/orders/orders_ddl_mssql_version0.sql

@@ -6,6 +6,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(1000) NULL, 
 	city VARCHAR(1000) NULL, 
 	[zip_codingSystem] VARCHAR(1000) NULL, 
+	zip_state VARCHAR(1000) NULL, 
 	zip_value VARCHAR(1000) NULL, 
 	country VARCHAR(1000) NULL, 
 	[phoneNumber] VARCHAR(8000) NULL, 

tests/sample_models/orders/orders_ddl_mssql_version1.sql

@@ -6,6 +6,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(1000) NULL, 
 	city VARCHAR(1000) NULL, 
 	[zip_codingSystem] VARCHAR(1000) NULL, 
+	zip_state VARCHAR(1000) NULL, 
 	zip_value VARCHAR(1000) NULL, 
 	country VARCHAR(1000) NULL, 
 	[phoneNumber] VARCHAR(8000) NULL, 

tests/sample_models/orders/orders_ddl_mssql_version2.sql

@@ -17,6 +17,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(1000) NULL, 
 	city VARCHAR(1000) NULL, 
 	[zip_codingSystem] VARCHAR(1000) NULL, 
+	zip_state VARCHAR(1000) NULL, 
 	zip_value VARCHAR(1000) NULL, 
 	country VARCHAR(1000) NULL, 
 	[phoneNumber] VARCHAR(8000) NULL, 
@@ -100,6 +101,7 @@ CREATE TABLE shiporder (
 	orderperson_address VARCHAR(1000) NULL, 
 	orderperson_city VARCHAR(1000) NULL, 
 	[orderperson_zip_codingSystem] VARCHAR(1000) NULL, 
+	orderperson_zip_state VARCHAR(1000) NULL, 
 	orderperson_zip_value VARCHAR(1000) NULL, 
 	orderperson_country VARCHAR(1000) NULL, 
 	[orderperson_phoneNumber] VARCHAR(8000) NULL, 

tests/sample_models/orders/orders_ddl_mysql_version0.sql

@@ -6,6 +6,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(255), 
 	city VARCHAR(255), 
 	`zip_codingSystem` VARCHAR(255), 
+	zip_state VARCHAR(255), 
 	zip_value VARCHAR(255), 
 	country VARCHAR(255), 
 	`phoneNumber` VARCHAR(4000), 

tests/sample_models/orders/orders_ddl_mysql_version1.sql

@@ -6,6 +6,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(255), 
 	city VARCHAR(255), 
 	`zip_codingSystem` VARCHAR(255), 
+	zip_state VARCHAR(255), 
 	zip_value VARCHAR(255), 
 	country VARCHAR(255), 
 	`phoneNumber` VARCHAR(4000), 

tests/sample_models/orders/orders_ddl_mysql_version2.sql

@@ -17,6 +17,7 @@ CREATE TABLE orderperson (
 	address VARCHAR(255), 
 	city VARCHAR(255), 
 	`zip_codingSystem` VARCHAR(255), 
+	zip_state VARCHAR(255), 
 	zip_value VARCHAR(255), 
 	country VARCHAR(255), 
 	`phoneNumber` VARCHAR(4000), 
@@ -100,6 +101,7 @@ CREATE TABLE shiporder (
 	orderperson_address VARCHAR(255), 
 	orderperson_city VARCHAR(255), 
 	`orderperson_zip_codingSystem` VARCHAR(255), 
+	orderperson_zip_state VARCHAR(255), 
 	orderperson_zip_value VARCHAR(255), 
 	orderperson_country VARCHAR(255), 
 	`orderperson_phoneNumber` VARCHAR(4000),