datacontract-cli 1.0.13__tar.gz → 1.0.14__tar.gz

{datacontract_cli-1.0.13/datacontract_cli.egg-info → datacontract_cli-1.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacontract-cli
-Version: 1.0.13
+Version: 1.0.14
 Summary: The datacontract CLI is an open source command-line tool for working with Data Contracts. It uses data contract YAML files to lint the data contract, connect to data sources and execute schema and quality tests, detect breaking changes, and export to different formats. The tool is written in Python. It can be used as a standalone CLI tool, in a CI/CD pipeline, or directly as a Python library.
 Author-email: Jochen Christ <jochen.christ@innoq.com>, Stefan Negele <stefan.negele@innoq.com>, Simon Harrer <simon.harrer@innoq.com>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typer<0.27,>=0.18.0
+Requires-Dist: typer<0.28,>=0.18.0
 Requires-Dist: click<9.0.0,>=8.1.0
 Requires-Dist: pydantic<2.14.0,>=2.8.2
 Requires-Dist: pyyaml~=6.0.1
@@ -42,7 +42,7 @@ Requires-Dist: openpyxl<4.0.0,>=3.1.5; extra == "excel"
 Provides-Extra: databricks
 Requires-Dist: ibis-framework[databricks,pyspark]<13.0.0,>=10.0.0; extra == "databricks"
 Requires-Dist: databricks-sql-connector<4.4.0,>=3.7.0; extra == "databricks"
-Requires-Dist: databricks-sdk<0.121.0; extra == "databricks"
+Requires-Dist: databricks-sdk<0.122.0; extra == "databricks"
 Requires-Dist: pyspark<5.0.0,>=3.5.0; extra == "databricks"
 Provides-Extra: iceberg
 Requires-Dist: pyiceberg==0.11.1; extra == "iceberg"
@@ -55,9 +55,11 @@ Requires-Dist: datacontract-cli[duckdb]; extra == "mysql"
 Provides-Extra: postgres
 Requires-Dist: ibis-framework[postgres]<13.0.0,>=10.0.0; extra == "postgres"
 Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "postgres"
+Requires-Dist: packaging<27.0,>=21.3; extra == "postgres"
 Provides-Extra: redshift
 Requires-Dist: ibis-framework[postgres]<13.0.0,>=10.0.0; extra == "redshift"
 Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "redshift"
+Requires-Dist: packaging<27.0,>=21.3; extra == "redshift"
 Provides-Extra: s3
 Requires-Dist: s3fs<2027.0.0,>=2025.2.0; extra == "s3"
 Requires-Dist: duckdb-extension-httpfs<1.6.0,>=1.5.0; extra == "s3"
@@ -71,18 +73,23 @@ Requires-Dist: duckdb-extension-azure<1.6.0,>=1.5.0; extra == "azure"
 Requires-Dist: azure-identity<1.26,>=1.17.1; extra == "azure"
 Requires-Dist: azure-storage-blob<12.31,>=12.24; extra == "azure"
 Provides-Extra: snowflake
-Requires-Dist: snowflake-connector-python[pandas]<4.7,>=3.6; extra == "snowflake"
+Requires-Dist: snowflake-connector-python[pandas]<4.8,>=3.6; extra == "snowflake"
 Requires-Dist: ibis-framework[snowflake]<13.0.0,>=10.0.0; extra == "snowflake"
 Provides-Extra: sqlserver
 Requires-Dist: ibis-framework[mssql]<13.0.0,>=10.0.0; extra == "sqlserver"
+Requires-Dist: packaging<27.0,>=21.3; extra == "sqlserver"
 Provides-Extra: oracle
 Requires-Dist: ibis-framework[oracle]<13.0.0,>=10.0.0; extra == "oracle"
+Requires-Dist: packaging<27.0,>=21.3; extra == "oracle"
 Provides-Extra: athena
 Requires-Dist: ibis-framework[athena]<13.0.0,>=10.0.0; extra == "athena"
+Requires-Dist: packaging<27.0,>=21.3; extra == "athena"
 Provides-Extra: trino
 Requires-Dist: ibis-framework[trino]<13.0.0,>=10.0.0; extra == "trino"
+Requires-Dist: packaging<27.0,>=21.3; extra == "trino"
 Provides-Extra: impala
 Requires-Dist: ibis-framework[impala]<13.0.0,>=10.0.0; extra == "impala"
+Requires-Dist: packaging<27.0,>=21.3; extra == "impala"
 Provides-Extra: dbml
 Requires-Dist: pydbml>=1.1.1; extra == "dbml"
 Provides-Extra: duckdb
@@ -112,7 +119,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: pymssql==2.3.13; extra == "dev"
 Requires-Dist: psycopg2-binary<3.0,>=2.9; extra == "dev"
 Requires-Dist: mysql-connector-python<9.7.0,>=8.0.30; extra == "dev"
-Requires-Dist: ruff==0.15.21; extra == "dev"
+Requires-Dist: ruff==0.15.22; extra == "dev"
 Requires-Dist: testcontainers[kafka,minio,mssql,mysql,postgres]==4.14.2; extra == "dev"
 Requires-Dist: trino==0.338.0; extra == "dev"
 Dynamic: license-file

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/datacontract/export/protobuf_exporter.py

@@ -1,11 +1,16 @@
+import re
 from typing import List, Optional
 
 from open_data_contract_standard.model import OpenDataContractStandard, SchemaProperty
 
 from datacontract.export.exporter import Exporter
+from datacontract.model.exceptions import DataContractException
 
 OBJECT_TYPES: set = {"object", "record", "struct"}
 
+# A valid proto package is a dot-separated sequence of identifiers.
+_PROTO_PACKAGE_PATTERN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)*$")
+
 
 class ProtoBufExporter(Exporter):
     def export(self, data_contract, schema_name, server, sql_server_type, export_args) -> str:
@@ -31,6 +36,27 @@ def _get_logical_type_option(prop: SchemaProperty, key: str):
     return prop.logicalTypeOptions.get(key)
 
 
+def _get_proto_package_name(data_contract: OpenDataContractStandard) -> str:
+    """
+    Returns the Protobuf package name from the contract's customProperties
+    ("protoPackageName"), falling back to "example".
+    """
+    if data_contract.customProperties is None:
+        return "example"
+    for cp in data_contract.customProperties:
+        if cp.property == "protoPackageName" and cp.value:
+            if not _PROTO_PACKAGE_PATTERN.match(cp.value):
+                raise DataContractException(
+                    type="protobuf-export",
+                    name="invalid-proto-package-name",
+                    reason=f"Invalid protoPackageName '{cp.value}'. "
+                    "Must be a dot-separated sequence of identifiers, e.g. 'com.example.mydata'.",
+                    engine="datacontract",
+                )
+            return cp.value
+    return "example"
+
+
 def to_protobuf(data_contract: OpenDataContractStandard) -> str:
     """
     Generates a Protobuf file from the data contract specification.
@@ -58,7 +84,7 @@ def to_protobuf(data_contract: OpenDataContractStandard) -> str:
 
     # Build header with syntax and package declarations.
     header = 'syntax = "proto3";\n\n'
-    package = "example"  # Default package, can be customized
+    package: str = _get_proto_package_name(data_contract)
     header += f"package {package};\n\n"
 
     # Append enum definitions before messages.
@@ -348,9 +374,8 @@ def _get_field_declaration(prop: SchemaProperty) -> str:
 
     logical_type = (prop.logicalType or "").lower()
     is_array = logical_type == "array"
-    is_message_type = logical_type in OBJECT_TYPES
 
-    # Add 'optional' only for non-required, non-array, non-message fields (scalars/enums)
-    if hasattr(prop, "required") and prop.required is False and not is_array and not is_message_type:
+    # Add 'optional' only for non-required, non-array
+    if hasattr(prop, "required") and prop.required is False and not is_array:
         return f"optional {field_type}"
     return field_type

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/datacontract/integration/dbt_sync.py

@@ -482,9 +482,11 @@ def _singular_tests_for_qualities(
     *,
     label_prefix: str = "",
     field: Optional[str] = None,
+    model_version: Optional[str] = None,
 ) -> list[SingularTest]:
     """Generate singular tests for ODCS quality entries that have an associated `query` and bound."""
     out: list[SingularTest] = []
+    model_ref = _model_ref(model, model_version)
     for idx, quality in enumerate(qualities or [], start=1):
         if not quality.query:
             continue
@@ -495,13 +497,18 @@ def _singular_tests_for_qualities(
                 f"Skipping singular SQL test `{test_label}` on `{model}`: quality has a `query` but no `mustBe*` bound."
             )
             continue
+        # Resolve the ODCS model/field placeholders to dbt constructs. `{schema}` (which the test
+        # engine also resolves) has no clean dbt equivalent and is intentionally left untouched.
+        query = re.sub(r'["\']?\$?\{(model|table|object)}["\']?', model_ref, quality.query)
+        if field is not None:
+            query = re.sub(r'["\']?\$?\{(field|column|property)}["\']?', field, query)
         severity = _normalize_severity(quality.severity)
         filename = f"{_slugify(contract_id)}__{_slugify(contract_version)}__{_slugify(model)}__{_slugify(test_label)}"
         out.append(
             SingularTest(
                 filename=f"{filename}.sql",
                 sql=_build_singular_sql(
-                    quality.query,
+                    query,
                     predicate,
                     severity,
                     contract_id,
@@ -982,9 +989,14 @@ def generate_dbt_tests_for_schema(
                 run,
                 label_prefix=f"{prop.name}__",
                 field=prop.name,
+                model_version=model_version,
             )
         )
-    singulars.extend(_singular_tests_for_qualities(schema_obj.quality, contract_id, contract_version, model_name, run))
+    singulars.extend(
+        _singular_tests_for_qualities(
+            schema_obj.quality, contract_id, contract_version, model_name, run, model_version=model_version
+        )
+    )
     _disambiguate_singular_filenames(singulars)
 
     return model_dict, singulars

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/datacontract/lint/resolve.py

@@ -44,11 +44,12 @@ _SafeLoaderNoTimestamp.yaml_implicit_resolvers = {
 
 
 def _resolve_jsonschema_compliance_error_message_path(yaml_str, message):
+    except_message = message
+
     try:
         matches = re.findall(r"\[(\d+)\]", message)
         schema_index = matches[0] if len(matches) > 0 else None
         property_index = matches[1] if len(matches) > 1 else None
-        except_message = message
         if schema_index is not None and "schema" in yaml_str and int(schema_index) < len(yaml_str["schema"]):
             except_message = except_message.replace(
                 f"schema[{schema_index}]", f"schema.{yaml_str['schema'][int(schema_index)]['name']}"
@@ -68,8 +69,8 @@ def _resolve_jsonschema_compliance_error_message_path(yaml_str, message):
     except Exception:
         logging.warning("YAML doesn't conform to JSON schema. Could not resolve indexed schema or property names.")
         except_message = message
-    finally:
-        return except_message
+
+    return except_message
 
 
 def resolve_data_contract_dict(

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14/datacontract_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacontract-cli
-Version: 1.0.13
+Version: 1.0.14
 Summary: The datacontract CLI is an open source command-line tool for working with Data Contracts. It uses data contract YAML files to lint the data contract, connect to data sources and execute schema and quality tests, detect breaking changes, and export to different formats. The tool is written in Python. It can be used as a standalone CLI tool, in a CI/CD pipeline, or directly as a Python library.
 Author-email: Jochen Christ <jochen.christ@innoq.com>, Stefan Negele <stefan.negele@innoq.com>, Simon Harrer <simon.harrer@innoq.com>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typer<0.27,>=0.18.0
+Requires-Dist: typer<0.28,>=0.18.0
 Requires-Dist: click<9.0.0,>=8.1.0
 Requires-Dist: pydantic<2.14.0,>=2.8.2
 Requires-Dist: pyyaml~=6.0.1
@@ -42,7 +42,7 @@ Requires-Dist: openpyxl<4.0.0,>=3.1.5; extra == "excel"
 Provides-Extra: databricks
 Requires-Dist: ibis-framework[databricks,pyspark]<13.0.0,>=10.0.0; extra == "databricks"
 Requires-Dist: databricks-sql-connector<4.4.0,>=3.7.0; extra == "databricks"
-Requires-Dist: databricks-sdk<0.121.0; extra == "databricks"
+Requires-Dist: databricks-sdk<0.122.0; extra == "databricks"
 Requires-Dist: pyspark<5.0.0,>=3.5.0; extra == "databricks"
 Provides-Extra: iceberg
 Requires-Dist: pyiceberg==0.11.1; extra == "iceberg"
@@ -55,9 +55,11 @@ Requires-Dist: datacontract-cli[duckdb]; extra == "mysql"
 Provides-Extra: postgres
 Requires-Dist: ibis-framework[postgres]<13.0.0,>=10.0.0; extra == "postgres"
 Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "postgres"
+Requires-Dist: packaging<27.0,>=21.3; extra == "postgres"
 Provides-Extra: redshift
 Requires-Dist: ibis-framework[postgres]<13.0.0,>=10.0.0; extra == "redshift"
 Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "redshift"
+Requires-Dist: packaging<27.0,>=21.3; extra == "redshift"
 Provides-Extra: s3
 Requires-Dist: s3fs<2027.0.0,>=2025.2.0; extra == "s3"
 Requires-Dist: duckdb-extension-httpfs<1.6.0,>=1.5.0; extra == "s3"
@@ -71,18 +73,23 @@ Requires-Dist: duckdb-extension-azure<1.6.0,>=1.5.0; extra == "azure"
 Requires-Dist: azure-identity<1.26,>=1.17.1; extra == "azure"
 Requires-Dist: azure-storage-blob<12.31,>=12.24; extra == "azure"
 Provides-Extra: snowflake
-Requires-Dist: snowflake-connector-python[pandas]<4.7,>=3.6; extra == "snowflake"
+Requires-Dist: snowflake-connector-python[pandas]<4.8,>=3.6; extra == "snowflake"
 Requires-Dist: ibis-framework[snowflake]<13.0.0,>=10.0.0; extra == "snowflake"
 Provides-Extra: sqlserver
 Requires-Dist: ibis-framework[mssql]<13.0.0,>=10.0.0; extra == "sqlserver"
+Requires-Dist: packaging<27.0,>=21.3; extra == "sqlserver"
 Provides-Extra: oracle
 Requires-Dist: ibis-framework[oracle]<13.0.0,>=10.0.0; extra == "oracle"
+Requires-Dist: packaging<27.0,>=21.3; extra == "oracle"
 Provides-Extra: athena
 Requires-Dist: ibis-framework[athena]<13.0.0,>=10.0.0; extra == "athena"
+Requires-Dist: packaging<27.0,>=21.3; extra == "athena"
 Provides-Extra: trino
 Requires-Dist: ibis-framework[trino]<13.0.0,>=10.0.0; extra == "trino"
+Requires-Dist: packaging<27.0,>=21.3; extra == "trino"
 Provides-Extra: impala
 Requires-Dist: ibis-framework[impala]<13.0.0,>=10.0.0; extra == "impala"
+Requires-Dist: packaging<27.0,>=21.3; extra == "impala"
 Provides-Extra: dbml
 Requires-Dist: pydbml>=1.1.1; extra == "dbml"
 Provides-Extra: duckdb
@@ -112,7 +119,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: pymssql==2.3.13; extra == "dev"
 Requires-Dist: psycopg2-binary<3.0,>=2.9; extra == "dev"
 Requires-Dist: mysql-connector-python<9.7.0,>=8.0.30; extra == "dev"
-Requires-Dist: ruff==0.15.21; extra == "dev"
+Requires-Dist: ruff==0.15.22; extra == "dev"
 Requires-Dist: testcontainers[kafka,minio,mssql,mysql,postgres]==4.14.2; extra == "dev"
 Requires-Dist: trino==0.338.0; extra == "dev"
 Dynamic: license-file

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/datacontract_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-typer<0.27,>=0.18.0
+typer<0.28,>=0.18.0
 click<9.0.0,>=8.1.0
 pydantic<2.14.0,>=2.8.2
 pyyaml~=6.0.1
@@ -28,6 +28,7 @@ uvicorn<0.52.0,>=0.44.0
 
 [athena]
 ibis-framework[athena]<13.0.0,>=10.0.0
+packaging<27.0,>=21.3
 
 [avro]
 avro==1.12.1
@@ -47,7 +48,7 @@ pandas>=2.0.0
 [databricks]
 ibis-framework[databricks,pyspark]<13.0.0,>=10.0.0
 databricks-sql-connector<4.4.0,>=3.7.0
-databricks-sdk<0.121.0
+databricks-sdk<0.122.0
 pyspark<5.0.0,>=3.5.0
 
 [dbml]
@@ -66,7 +67,7 @@ pytest-xdist
 pymssql==2.3.13
 psycopg2-binary<3.0,>=2.9
 mysql-connector-python<9.7.0,>=8.0.30
-ruff==0.15.21
+ruff==0.15.22
 testcontainers[kafka,minio,mssql,mysql,postgres]==4.14.2
 trino==0.338.0
 
@@ -86,6 +87,7 @@ pyiceberg==0.11.1
 
 [impala]
 ibis-framework[impala]<13.0.0,>=10.0.0
+packaging<27.0,>=21.3
 
 [kafka]
 datacontract-cli[avro]
@@ -97,6 +99,7 @@ datacontract-cli[duckdb]
 
 [oracle]
 ibis-framework[oracle]<13.0.0,>=10.0.0
+packaging<27.0,>=21.3
 
 [parquet]
 pyarrow>=18.1.0
@@ -104,6 +107,7 @@ pyarrow>=18.1.0
 [postgres]
 ibis-framework[postgres]<13.0.0,>=10.0.0
 psycopg[binary]<4.0,>=3.1
+packaging<27.0,>=21.3
 
 [protobuf]
 proto-schema-parser<3.0,>=1.0
@@ -114,6 +118,7 @@ rdflib==7.6.0
 [redshift]
 ibis-framework[postgres]<13.0.0,>=10.0.0
 psycopg[binary]<4.0,>=3.1
+packaging<27.0,>=21.3
 
 [s3]
 s3fs<2027.0.0,>=2025.2.0
@@ -121,11 +126,13 @@ duckdb-extension-httpfs<1.6.0,>=1.5.0
 duckdb-extension-aws<1.6.0,>=1.5.0
 
 [snowflake]
-snowflake-connector-python[pandas]<4.7,>=3.6
+snowflake-connector-python[pandas]<4.8,>=3.6
 ibis-framework[snowflake]<13.0.0,>=10.0.0
 
 [sqlserver]
 ibis-framework[mssql]<13.0.0,>=10.0.0
+packaging<27.0,>=21.3
 
 [trino]
 ibis-framework[trino]<13.0.0,>=10.0.0
+packaging<27.0,>=21.3

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datacontract-cli"
-version = "1.0.13"
+version = "1.0.14"
 description = "The datacontract CLI is an open source command-line tool for working with Data Contracts. It uses data contract YAML files to lint the data contract, connect to data sources and execute schema and quality tests, detect breaking changes, and export to different formats. The tool is written in Python. It can be used as a standalone CLI tool, in a CI/CD pipeline, or directly as a Python library."
 license = "MIT"
 readme = "README.md"
@@ -15,7 +15,7 @@ classifiers = [
 ]
 requires-python = ">=3.10,<3.15"
 dependencies = [
-  "typer>=0.18.0,<0.27",
+  "typer>=0.18.0,<0.28",
   "click>=8.1.0,<9.0.0",
   "pydantic>=2.8.2,<2.14.0",
   "pyyaml~=6.0.1",
@@ -59,7 +59,7 @@ excel = [
 databricks = [
   "ibis-framework[databricks,pyspark]>=10.0.0,<13.0.0",
   "databricks-sql-connector>=3.7.0,<4.4.0",
-  "databricks-sdk<0.121.0",
+  "databricks-sdk<0.122.0",
   # Not capped to Spark 3.5.x like older builds were: the databricks path uses a
   # caller-provided Spark session (or the databricks SQL connector) and never
   # loads the Kafka/Avro connector jars, so it isn't tied to a Scala/Spark line.
@@ -93,6 +93,8 @@ postgres = [
   # psycopg's binary wheels bundle libpq, so the extra works without
   # PostgreSQL client libraries installed on the system.
   "psycopg[binary]>=3.1,<4.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 redshift = [
@@ -101,6 +103,8 @@ redshift = [
   # psycopg's binary wheels bundle libpq, so the extra works without
   # PostgreSQL client libraries installed on the system.
   "psycopg[binary]>=3.1,<4.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 # DuckDB extension wheels are bundled for air-gapped installs. The 1.5.x line
@@ -125,28 +129,38 @@ azure = [
 ]
 
 snowflake = [
-  "snowflake-connector-python[pandas]>=3.6,<4.7",
+  "snowflake-connector-python[pandas]>=3.6,<4.8",
   "ibis-framework[snowflake]>=10.0.0,<13.0.0"
 ]
 
 sqlserver = [
-  "ibis-framework[mssql]>=10.0.0,<13.0.0"
+  "ibis-framework[mssql]>=10.0.0,<13.0.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 oracle = [
-  "ibis-framework[oracle]>=10.0.0,<13.0.0"
+  "ibis-framework[oracle]>=10.0.0,<13.0.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 athena = [
-  "ibis-framework[athena]>=10.0.0,<13.0.0"
+  "ibis-framework[athena]>=10.0.0,<13.0.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 trino = [
-  "ibis-framework[trino]>=10.0.0,<13.0.0"
+  "ibis-framework[trino]>=10.0.0,<13.0.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 impala = [
-  "ibis-framework[impala]>=10.0.0,<13.0.0"
+  "ibis-framework[impala]>=10.0.0,<13.0.0",
+  # ibis loads its datafusion compiler (needs packaging) but omits it from this extra.
+  "packaging>=21.3,<27.0",
 ]
 
 dbml = [
@@ -200,7 +214,7 @@ dev = [
   # psycopg v3 and DuckDB's mysql extension respectively).
   "psycopg2-binary>=2.9,<3.0",
   "mysql-connector-python>=8.0.30,<9.7.0",
-  "ruff==0.15.21",
+  "ruff==0.15.22",
   "testcontainers[minio,postgres,kafka,mssql,mysql]==4.14.2",
   "trino==0.338.0",
 ]

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/tests/test_dbt_sync.py

@@ -684,6 +684,32 @@ def test_singular_tests_skipped_when_query_has_no_bound():
     assert any("no `mustBe*` bound" in log.message for log in run.logs)
 
 
+def test_singular_query_resolves_object_and_property_placeholders():
+    """ODCS `{object}`/`{property}` placeholders in a custom `quality.query` resolve to the dbt
+    `ref()` and column name so the generated singular test compiles (issue #1397)."""
+    run = Run.create_run()
+    qualities = [
+        DataQuality(
+            query="SELECT COUNT(*) FROM {object} WHERE {property} < 0",
+            mustBe=0,
+            name="positive",
+        )
+    ]
+    out = _singular_tests_for_qualities(qualities, "c", "1.0.0", "MY_TABLE", run, field="my_column")
+    assert len(out) == 1
+    assert "SELECT COUNT(*) FROM {{ ref('MY_TABLE') }} WHERE my_column < 0" in out[0].sql
+    assert "{object}" not in out[0].sql
+    assert "{property}" not in out[0].sql
+
+
+def test_singular_query_placeholder_resolves_versioned_ref():
+    """On a versioned model, `{object}` resolves to a version-pinned `ref()`."""
+    run = Run.create_run()
+    qualities = [DataQuality(query="SELECT COUNT(*) FROM {model}", mustBe=0, name="rc")]
+    out = _singular_tests_for_qualities(qualities, "c", "1.0.0", "MY_TABLE", run, model_version="2")
+    assert "{{ ref('MY_TABLE', version=2) }}" in out[0].sql
+
+
 def test_generate_outputs_warns_on_unsupported_model_qualities():
     """Model-level qualities that can't map to a test are skipped with a warning — not dropped
     silently or crashed on: a `rowCount` with no bound, and a non-`rowCount` metric with no query."""

{datacontract_cli-1.0.13 → datacontract_cli-1.0.14}/tests/test_export_protobuf.py

@@ -1,9 +1,11 @@
+import pytest
 import yaml
 from open_data_contract_standard.model import OpenDataContractStandard
 from typer.testing import CliRunner
 
 from datacontract.cli import app
 from datacontract.export.protobuf_exporter import to_protobuf
+from datacontract.model.exceptions import DataContractException
 
 # logging.basicConfig(level=logging.DEBUG, force=True)
 
@@ -77,6 +79,14 @@ schema:
       - name: user
         logicalType: string
         description: Field user
+      - name: sub_review
+        description: Details of sub review.
+        required: False
+        logicalType: object
+        properties:
+          - name: comment
+            logicalType: string
+            description: Field comment
 """
     data_contract = OpenDataContractStandard(**yaml.safe_load(odcs_yaml))
 
@@ -117,16 +127,64 @@ message Product {
 
 // Details of Review.
 message Review {
+  // Details of sub review.
+  message SubReview {
+    // Field comment
+    string comment = 1;
+  }
+
   // Field comment
   string comment = 1;
   // Field rating
   int32 rating = 2;
   // Field user
   string user = 3;
+  // Details of sub review.
+  optional SubReview sub_review = 4;
 }
 
-
     """.strip()
     result = to_protobuf(data_contract).strip()
 
     assert result == expected_protobuf
+
+
+def test_to_protobuf_custom_package_name():
+    odcs_yaml = """
+kind: DataContract
+apiVersion: v3.1.0
+id: test_protobuf
+customProperties:
+  - property: protoPackageName
+    value: com.example.product
+schema:
+  - name: Product
+    properties:
+      - name: id
+        logicalType: string
+"""
+    data_contract = OpenDataContractStandard(**yaml.safe_load(odcs_yaml))
+
+    result = to_protobuf(data_contract)
+
+    assert "package com.example.product;\n" in result
+
+
+def test_to_protobuf_invalid_package_name():
+    odcs_yaml = """
+kind: DataContract
+apiVersion: v3.1.0
+id: test_protobuf
+customProperties:
+  - property: protoPackageName
+    value: "123 not a package!"
+schema:
+  - name: Product
+    properties:
+      - name: id
+        logicalType: string
+"""
+    data_contract = OpenDataContractStandard(**yaml.safe_load(odcs_yaml))
+
+    with pytest.raises(DataContractException):
+        to_protobuf(data_contract)