Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ bigquery = ["google-cloud-bigquery>=3.10.0"]
redshift = ["psycopg2>=2.9.9"]
postgres = ["psycopg2>=2.9.9"]
snowflake = ["snowflake-connector-python>=3.8.1"]
dev = ["pytest", "python-dotenv", "ruff", "pre-commit"]
dev = ["pytest", "dotenv", "ruff", "pre-commit"]
all = [
"google-cloud-bigquery>=3.10.0",
"psycopg2>=2.9.9",
"snowflake-connector-python>=3.8.1",
"pytest",
"python-dotenv",
"dotenv",
"ruff",
"pre-commit",
]
Expand Down
17 changes: 12 additions & 5 deletions src/dwh2looker/lookml_generator/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,20 @@ def create_dimension(self, field: db.Field, parent_view_path: str = None):
len(array_path) :
].lstrip(".")
if relative_parent_path:
field_sql_name = (
f"${{TABLE}}.{relative_parent_path}.{original_field_name}"
)
if field.parent_field_type == "ARRAY":
field_sql_name = "${TABLE}"
else:
field_sql_name = f"${{TABLE}}.{relative_parent_path}.{original_field_name}"
else:
field_sql_name = f"${{TABLE}}.{original_field_name}"
if field.parent_field_type == "ARRAY":
field_sql_name = "${TABLE}"
else:
field_sql_name = f"${{TABLE}}.{original_field_name}"
elif field.parent_field_name == array_path:
field_sql_name = f"${{TABLE}}.{original_field_name}"
if field.parent_field_type == "ARRAY":
field_sql_name = "${TABLE}"
else:
field_sql_name = f"${{TABLE}}.{original_field_name}"

if (
not (is_nested or is_array)
Expand Down
6 changes: 3 additions & 3 deletions src/dwh2looker/lookml_generator/lookml_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def generate_lookml(
if output_dir_info not in self.output_dirs:
self.output_dirs.append(output_dir_info)

output_dir_path = f"base_views_{self.env}"
output_dir_path = f"base_views_{self.env}" if self.env else "base_views"
self.file_writer.write_lookml(
content=lkml_view_output,
file_name=view_name,
Expand All @@ -392,7 +392,7 @@ def _push_lookml_to_repo(self):

# get remote path from config
remote_path = self.looker_repo_structure.get(str(view_type)).replace(
"env", env if env else "env"
"env", env if env is not None else "env"
)

self.github_client.update_files(
Expand Down Expand Up @@ -428,7 +428,7 @@ def generate_batch_lookml_views(self, override_dataset_id: str = None):
self.client = db.DbClient(db_type=self.db_type, credentials=credentials)
self.dataset_id = table_env.get("dataset_id")
self.project_id = table_env.get("project_id")
self.env = table_env.get("env")
self.env = table_env.get("env") if table_env.get("env") else ""
self.exclude_tables = table_env.get("exclude_tables", [])

tables = self.client.get_table_names(dataset_id=self.dataset_id)
Expand Down
Loading
Loading