Skip to content

feat: add new fields regarding NULL values #1277

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

Draft
fiedlr wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: add new fields regarding NULL values #1277

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions ...ddata-sdk/src/gooddata_sdk/catalog/data_source/declarative_model/physical_model/column.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class CatalogDeclarativeColumn(Base):
is_primary_key: Optional[bool] = None
referenced_table_id: Optional[str] = None
referenced_table_column: Optional[str] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeColumn]:
Expand Down
10 changes: 10 additions & 0 deletions ...oddata_sdk/catalog/workspace/declarative_model/workspace/logical_model/dataset/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ class CatalogDeclarativeAttribute(Base):
tags: Optional[list[str]] = None
is_hidden: Optional[bool] = None
locale: Optional[str] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeAttribute]:
Expand All @@ -97,6 +99,8 @@ class CatalogDeclarativeFact(Base):
description: Optional[str] = None
tags: Optional[list[str]] = None
is_hidden: Optional[bool] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeFact]:
Expand All @@ -121,6 +125,8 @@ class CatalogDeclarativeAggregatedFact(Base):
source_column_data_type: Optional[str] = None
description: Optional[str] = None
tags: Optional[list[str]] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeAggregatedFact]:
Expand Down Expand Up @@ -171,6 +177,8 @@ class CatalogDeclarativeLabel(Base):
locale: Optional[str] = None
translations: Optional[list[CatalogDeclarativeLabelTranslation]] = None
geo_area_config: Optional[CatalogGeoAreaConfig] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeLabel]:
Expand Down Expand Up @@ -203,6 +211,8 @@ class CatalogDeclarativeReference(Base):
source_columns: Optional[list[str]] = None
source_column_data_types: Optional[list[str]] = None
sources: Optional[list[CatalogDeclarativeReferenceSource]] = None
is_nullable: Optional[bool] = None
null_value: Optional[str] = None

@staticmethod
def client_class() -> type[DeclarativeReference]:
Expand Down
60 changes: 40 additions & 20 deletions packages/gooddata-sdk/tests/catalog/expected/declarative_ldm_with_sql_dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"description": "Campaign channel id",
"tags": [
"Campaign channels"
]
],
"is_nullable": false
},
{
"id": "campaign_channels.category",
Expand All @@ -51,7 +52,8 @@
"description": "Category",
"tags": [
"Campaign channels"
]
],
"is_nullable": true
},
{
"id": "type",
Expand All @@ -62,7 +64,8 @@
"description": "Type",
"tags": [
"Campaign channels"
]
],
"is_nullable": true
}
],
"facts": [
Expand All @@ -74,7 +77,8 @@
"description": "Budget",
"tags": [
"Campaign channels"
]
],
"is_nullable": true
},
{
"id": "spend",
Expand All @@ -84,7 +88,8 @@
"description": "Spend",
"tags": [
"Campaign channels"
]
],
"is_nullable": true
}
],
"dataSourceTableId": {
Expand Down Expand Up @@ -121,7 +126,8 @@
"description": "Campaign name",
"tags": [
"Campaigns"
]
],
"is_nullable": true
},
{
"id": "campaigns.campaign_id",
Expand All @@ -132,7 +138,8 @@
"description": "Campaign id",
"tags": [
"Campaigns"
]
],
"is_nullable": false
}
],
"facts": [],
Expand Down Expand Up @@ -170,7 +177,8 @@
"description": "Customer id",
"tags": [
"Customers"
]
],
"is_nullable": false
},
{
"id": "customers.customer_name",
Expand All @@ -181,7 +189,8 @@
"description": "Customer name",
"tags": [
"Customers"
]
],
"is_nullable": true
},
{
"id": "customers.region",
Expand All @@ -192,7 +201,8 @@
"description": "Region",
"tags": [
"Customers"
]
],
"is_nullable": true
},
{
"id": "customers.state",
Expand All @@ -206,7 +216,8 @@
"tags": [
"Customers"
],
"valueType": "GEO"
"valueType": "GEO",
"is_nullable": true
}
],
"sourceColumn": "state",
Expand All @@ -215,7 +226,8 @@
"description": "State",
"tags": [
"Customers"
]
],
"is_nullable": true
}
],
"facts": [],
Expand Down Expand Up @@ -322,7 +334,8 @@
"description": "Order id",
"tags": [
"Order lines"
]
],
"is_nullable": true
},
{
"id": "order_lines.order_line_id",
Expand All @@ -333,7 +346,8 @@
"description": "Order line id",
"tags": [
"Order lines"
]
],
"is_nullable": false
},
{
"id": "order_lines.order_status",
Expand All @@ -344,7 +358,8 @@
"description": "Order status",
"tags": [
"Order lines"
]
],
"is_nullable": true
}
],
"facts": [
Expand All @@ -356,7 +371,8 @@
"description": "Price",
"tags": [
"Order lines"
]
],
"is_nullable": true
},
{
"id": "order_lines.quantity",
Expand All @@ -366,7 +382,8 @@
"description": "Quantity",
"tags": [
"Order lines"
]
],
"is_nullable": true
}
],
"dataSourceTableId": {
Expand Down Expand Up @@ -413,7 +430,8 @@
"description": "Product name",
"tags": [
"Products"
]
],
"is_nullable": true
},
{
"id": "products.category",
Expand All @@ -424,7 +442,8 @@
"description": "Category",
"tags": [
"Products"
]
],
"is_nullable": true
},
{
"id": "products.product_id",
Expand All @@ -435,7 +454,8 @@
"description": "Product id",
"tags": [
"Products"
]
],
"is_nullable": false
}
],
"facts": [],
Expand Down
20 changes: 16 additions & 4 deletions packages/gooddata-sdk/tests/catalog/test_catalog_data_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
)
from gooddata_sdk.catalog.data_source.entity_model.data_source import DatabaseAttributes
from gooddata_sdk.catalog.entity import ClientSecretCredentialsFromFile
from tests_support.compare_utils import deep_eq
from tests_support.file_utils import load_json
from tests_support.vcrpy_utils import get_vcr

Expand Down Expand Up @@ -93,7 +94,11 @@ def test_generate_logical_model(test_config: dict):
"""
# Filter out SQL-based datasets (those have sql property set, no data_source_table_id)
table_based_datasets = [ds for ds in declarative_model.ldm.datasets if ds.sql is None]
assert table_based_datasets == generated_declarative_model.ldm.datasets

for i, dataset in enumerate(table_based_datasets):
print(f"Dataset: {dataset.id}")
assert deep_eq(dataset, generated_declarative_model.ldm.datasets[i])

assert len(declarative_model.ldm.date_instances) == len(generated_declarative_model.ldm.date_instances)


Expand All @@ -117,7 +122,10 @@ def test_scan_pdm_and_generate_logical_model(test_config: dict):
"""
# Filter out SQL-based datasets (those have sql property set, no data_source_table_id)
table_based_datasets = [ds for ds in declarative_model.ldm.datasets if ds.sql is None]
assert table_based_datasets == generated_declarative_model.ldm.datasets
for i, dataset in enumerate(table_based_datasets):
print(f"Dataset: {dataset.id}")
assert deep_eq(dataset, generated_declarative_model.ldm.datasets[i])

assert len(declarative_model.ldm.date_instances) == len(generated_declarative_model.ldm.date_instances)


Expand Down Expand Up @@ -182,7 +190,9 @@ def test_generate_logical_model_with_sql_datasets(test_config: dict):
# and remove sort once fixed
generated_declarative_model.ldm.datasets.sort(key=lambda dataset: dataset.id)
expected_ldm.ldm.datasets.sort(key=lambda dataset: dataset.id)
assert expected_ldm.ldm.datasets == generated_declarative_model.ldm.datasets
for i, dataset in enumerate(expected_ldm.ldm.datasets):
print(f"Dataset: {dataset.id}")
assert deep_eq(dataset, generated_declarative_model.ldm.datasets[i])
assert len(expected_ldm.ldm.date_instances) == len(generated_declarative_model.ldm.date_instances)


Expand All @@ -208,7 +218,9 @@ def test_scan_pdm_and_generate_logical_model_with_sql_datasets(test_config: dict
# and remove sort once fixed
generated_declarative_model.ldm.datasets.sort(key=lambda dataset: dataset.id)
expected_ldm.ldm.datasets.sort(key=lambda dataset: dataset.id)
assert expected_ldm.ldm.datasets == generated_declarative_model.ldm.datasets
for i, dataset in enumerate(expected_ldm.ldm.datasets):
print(f"Dataset {dataset.id}")
assert deep_eq(dataset, generated_declarative_model.ldm.datasets[i])
assert len(expected_ldm.ldm.date_instances) == len(generated_declarative_model.ldm.date_instances)


Expand Down
Loading