Skip to content

fix: wrap column names in generated SQL schema files #89

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

Open
rokf wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

fix: wrap column names in generated SQL schema files #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions pysmartdatamodels/pysmartdatamodels/pysmartdatamodels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ def generate_sql_schema(model_yaml: str) -> str:
# format type mapping (format overrides type)
field_type = format_mapping.get(value["format"])
# add attribute to the SQL schema statement
sql_schema_statements.append(f"{key} {field_type}")
sql_schema_statements.append(f"\"{key}\" {field_type}")

elif "enum" in value:
enum_values = value["enum"]
Expand All @@ -1202,15 +1202,15 @@ def generate_sql_schema(model_yaml: str) -> str:
sql_data_types += ");"

# add attribute to the SQL schema statement
sql_schema_statements.append(f"{key} {field_type}")
sql_schema_statements.append(f"\"{key}\" {field_type}")

else:
field_type = type_mapping.get(value["type"])
# add attribute to the SQL schema statement
sql_schema_statements.append(f"{key} {field_type}")
sql_schema_statements.append(f"\"{key}\" {field_type}")
elif "oneOf" in value:
field_type = "JSON"
sql_schema_statements.append(f"{key} {field_type}")
sql_schema_statements.append(f"\"{key}\" {field_type}")

# Handle the case when "allOf" exists
if key == "allOf" and isinstance(value, list):
Expand All @@ -1219,15 +1219,15 @@ def generate_sql_schema(model_yaml: str) -> str:
if isinstance(sub_value, dict):
if "format" in sub_value:
sub_field_type = format_mapping.get(sub_value["format"])
sql_schema_statements.append(f"{sub_key} {sub_field_type}")
sql_schema_statements.append(f"\"{sub_key}\" {sub_field_type}")
if "type" in sub_value:
sub_field_type = type_mapping.get(sub_value["type"])
sql_schema_statements.append(f"{sub_key} {sub_field_type}")
sql_schema_statements.append(f"\"{sub_key}\" {sub_field_type}")

if key == "id":
field_type = "TEXT PRIMARY KEY"
# add attribute to the SQL schema statement
sql_schema_statements.append(f"{key} {field_type}")
sql_schema_statements.append(f"\"{key}\" {field_type}")

# Complete the CREATE TABLE statement
table_create_statement += ", ".join(sql_schema_statements)
Expand Down