Skip to content

Fix KeyError when xs:choice branches share an element with same name and type #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinv13 merged 2 commits into from
Jun 13, 2026
Merged

Fix KeyError when xs:choice branches share an element with same name and type #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f383466
Fix KeyError when xs:choice branches share an element with same name …
martinv13 Jun 11, 2026
28a43c1
Bump version from 0.13.1 to 0.13.2
martinv13 Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "xml2db"
version = "0.13.1"
version = "0.13.2"
authors = [
{ name="Commission de régulation de l'énergie", email="opensource@cre.fr" },
]
Expand Down
10 changes: 10 additions & 0 deletions src/xml2db/table/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ def add_relation_1(
raise ValueError(
"attempting to add a 1-1 relationship with max occurrences different from 1"
)
if (
name in self.relations_1
and self.relations_1[name].other_table.type_name == other_table.type_name
):
return
rel = DataModelRelation1(
name,
[(name, other_table.type_name)],
Expand All @@ -206,6 +211,11 @@ def add_relation_n(self, name, other_table, occurs, ngroup):
raise ValueError(
"attempting to add a 1-n relationship with max occurrences equal to 1"
)
if (
name in self.relations_n
and self.relations_n[name].other_table.type_name == other_table.type_name
):
return
rel = DataModelRelationN(
name,
[(name, other_table.type_name)],
Expand Down
13 changes: 13 additions & 0 deletions tests/sample_models/orders/orders.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,26 @@
</xs:sequence>
</xs:complexType>

<!-- deliveryType tests the case where the same element name and complex type appear
in two branches of a xs:choice (sequence branch and standalone branch) -->
<xs:complexType name="deliveryType">
<xs:choice>
<xs:sequence>
<xs:element name="from" type="contacttype"/>
<xs:element name="to" type="contacttype"/>
</xs:sequence>
<xs:element name="to" type="contacttype"/>
</xs:choice>
</xs:complexType>

<xs:complexType name="itemtype">
<xs:sequence>
<xs:element name="product" type="producttype" minOccurs="1" maxOccurs="1"/>
<xs:element name="note" type="bt:stringtype" minOccurs="0"/>
<xs:element name="quantity" type="bt:quantitytype"/>
<xs:element name="price" type="bt:dectype"/>
<xs:element name="currency" type="bt:currencytype"/>
<xs:element name="delivery" type="deliveryType" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>

Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mssql_version0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ CREATE TABLE item (
quantity INTEGER NULL,
price DOUBLE PRECISION NULL,
currency CHAR(3) NULL,
delivery_from_fk_orderperson INTEGER NULL,
delivery_to_fk_orderperson INTEGER NULL,
record_hash BINARY(20) NULL,
CONSTRAINT cx_pk_item PRIMARY KEY CLUSTERED (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash)
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mssql_version1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ CREATE TABLE item (
quantity INTEGER NULL,
price DOUBLE PRECISION NULL,
currency CHAR(3) NULL,
delivery_from_fk_orderperson INTEGER NULL,
delivery_to_fk_orderperson INTEGER NULL,
CONSTRAINT cx_pk_item PRIMARY KEY CLUSTERED (pk_item),
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder)
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mssql_version2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,14 @@ CREATE TABLE item (
quantity INTEGER NULL,
price DOUBLE PRECISION NULL,
currency CHAR(3) NULL,
delivery_from_fk_orderperson INTEGER NULL,
delivery_to_fk_orderperson INTEGER NULL,
xml2db_record_hash BINARY(20) NULL,
CONSTRAINT cx_pk_item PRIMARY KEY CLUSTERED (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (xml2db_record_hash),
FOREIGN KEY(fk_product) REFERENCES product (pk_product)
FOREIGN KEY(fk_product) REFERENCES product (pk_product),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mysql_version0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
record_hash BINARY(20),
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash)
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mysql_version1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder)
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_mysql_version2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,14 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
xml2db_record_hash BINARY(20),
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (xml2db_record_hash),
FOREIGN KEY(fk_product) REFERENCES product (pk_product)
FOREIGN KEY(fk_product) REFERENCES product (pk_product),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_postgresql_version0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE PRECISION,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
record_hash BYTEA,
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash)
CONSTRAINT item_xml2db_record_hash UNIQUE (record_hash),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_postgresql_version1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE PRECISION,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder)
FOREIGN KEY(fk_parent_shiporder) REFERENCES shiporder (pk_shiporder),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
6 changes: 5 additions & 1 deletion tests/sample_models/orders/orders_ddl_postgresql_version2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,14 @@ CREATE TABLE item (
quantity INTEGER,
price DOUBLE PRECISION,
currency VARCHAR(3),
delivery_from_fk_orderperson INTEGER,
delivery_to_fk_orderperson INTEGER,
xml2db_record_hash BYTEA,
CONSTRAINT cx_pk_item PRIMARY KEY (pk_item),
CONSTRAINT item_xml2db_record_hash UNIQUE (xml2db_record_hash),
FOREIGN KEY(fk_product) REFERENCES product (pk_product)
FOREIGN KEY(fk_product) REFERENCES product (pk_product),
FOREIGN KEY(delivery_from_fk_orderperson) REFERENCES orderperson (pk_orderperson),
FOREIGN KEY(delivery_to_fk_orderperson) REFERENCES orderperson (pk_orderperson)
)


Expand Down
2 changes: 2 additions & 0 deletions tests/sample_models/orders/orders_erd_version0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ erDiagram
string orderid
dateTime processed_at
}
item ||--o| orderperson : "delivery_from"
item ||--o| orderperson : "delivery_to"
item ||--o{ intfeature_with_peculiarly_long_suffix_which_overflow_max_length : "product_features_intfeature_with_peculiarly_long_suffix_which_overflow_max_length*"
item ||--o{ stringfeature : "product_features_stringfeature*"
item {
Expand Down
2 changes: 2 additions & 0 deletions tests/sample_models/orders/orders_erd_version1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
```mermaid
erDiagram
item ||--o| orderperson : "delivery_from"
item ||--o| orderperson : "delivery_to"
item ||--o{ intfeature_with_peculiarly_long_suffix_which_overflow_max_length : "product_features_intfeature_with_peculiarly_long_suffix_which_overflow_max_length*"
item ||--o{ stringfeature : "product_features_stringfeature*"
item {
Expand Down
2 changes: 2 additions & 0 deletions tests/sample_models/orders/orders_erd_version2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ erDiagram
string orderperson_a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length
}
item ||--|| product : "product"
item ||--o| orderperson : "delivery_from"
item ||--o| orderperson : "delivery_to"
item {
string note
integer quantity
Expand Down
39 changes: 38 additions & 1 deletion tests/sample_models/orders/orders_source_tree_version0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,41 @@ orders:
note[0, 1]: string
quantity[1, 1]: integer
price[1, 1]: decimal
currency[1, 1]: string
currency[1, 1]: string
delivery[0, 1] (choice):
from[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
to[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
39 changes: 38 additions & 1 deletion tests/sample_models/orders/orders_source_tree_version1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,41 @@ orders:
note[0, 1]: string
quantity[1, 1]: integer
price[1, 1]: decimal
currency[1, 1]: string
currency[1, 1]: string
delivery[0, 1] (choice):
from[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
to[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
39 changes: 38 additions & 1 deletion tests/sample_models/orders/orders_source_tree_version2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,41 @@ orders:
note[0, 1]: string
quantity[1, 1]: integer
price[1, 1]: decimal
currency[1, 1]: string
currency[1, 1]: string
delivery[0, 1] (choice):
from[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
to[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip[1, 1]:
codingSystem[0, 1]: string
state[0, 1]: string
value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId[0, 1] (choice):
ace[0, 1]: string
bic[0, 1]: string
lei[0, 1]: string
coordinates[0, 1]: string
extra[0, 1]:
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
30 changes: 29 additions & 1 deletion tests/sample_models/orders/orders_target_tree_version0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,32 @@ orders:
note[0, 1]: string
quantity[1, 1]: integer
price[1, 1]: decimal
currency[1, 1]: string
currency[1, 1]: string
delivery_from[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip_codingSystem[0, 1]: string
zip_state[0, 1]: string
zip_value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId_type[0, 1]: string
companyId_value[0, 1]: string
coordinates[0, 1]: string
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
delivery_to[0, 1]:
name_attr[0, 1]: string
name[1, 1]: string
address[1, 1]: string
city[1, 1]: string
zip_codingSystem[0, 1]: string
zip_state[0, 1]: string
zip_value[0, 1]: string
country[1, 1]: string
phoneNumber[0, None]: string
companyId_type[0, 1]: string
companyId_value[0, 1]: string
coordinates[0, 1]: string
a_very_long_field_type_that_makes_col_name_exceeds_max_identifier_length[0, 1]: string
Loading
Loading