Roll up dev-v3.2.0 into dev (includes the main sync)

CHANGELOG.md

@@ -55,13 +55,18 @@ RFCs targeting v3.2.0 are tracked under [`tsc/rfcs/`](https://github.com/bitol-i
   * The POSIX `${VAR_NAME:-default}` form supplies an inline default, used when the variable is unset or empty.
   * Tools MUST resolve references before using a value, SHOULD error on unresolvable references (never silently substitute an empty string), and MUST preserve unresolved tokens verbatim when serializing back to YAML.
   * Non-breaking: no new section or field is added to the standard; interpolation applies to string values only.
+  * Server `port` fields now accept a string in addition to an integer, so they can hold a variable reference such as `${DB_PORT}` or `${DB_PORT:-5432}`, which the previous integer-only type rejected.
 * **Adds** `id` to relationship objects ([RFC 0047](https://github.com/bitol-io/tsc/blob/main/rfcs/approved/odcs-v3.2.0/0047-relationship-id.md)):
   * New optional `id` string on `RelationshipBase` (surfaced on both schema-level and property-level relationships), completing the stable-identifier work of RFC-0026a for the last referenceable array-item object that lacked one.
   * MUST be unique within its containing `relationships` array; SHOULD be stable across contract versions; cannot contain `.` `#` `/` `\` `@` `!` `%` `&` `^`.
   * Non-breaking, as `id` is optional.
 * **Adds** Apache Iceberg server type ([RFC 0049](https://github.com/bitol-io/tsc/blob/main/rfcs/approved/odcs-v3.2.0/0049-iceberg-server-type.md)):
   * New `iceberg` server `type` describing access to Apache Iceberg catalogs through the standardized Iceberg REST API, with required `catalog` and `catalogUrl` plus optional `namespace` and `warehouse`.
   * Non-breaking: adds a new optional server type.
+* **Adds** Exasol server type ([RFC 0058](https://github.com/bitol-io/tsc/blob/main/rfcs/approved/odcs-v3.2.0/0058-exasol-server-type.md)):
+  * New `exasol` server `type` describing data served from Exasol, an in-memory MPP analytics database, with required `host` plus optional `port` (defaults to `8563`) and `schema`.
+  * No `database` field: an Exasol cluster runs a single database and the schema is the namespace. `host` may be a cluster connection range, e.g. `n11..14.acme.com`.
+  * Non-breaking: adds a new optional server type.
 * **Changes** to Servers:
   * Add optional Athena Server `workgroup` field and fix `stagingDir` to be optional in schema.
 

context7.json

@@ -0,0 +1,4 @@
+{
+  "url": "https://context7.com/bitol-io/open-data-contract-standard",
+  "public_key": "pk_C11eRTOix9LEfxZ9vwIdq"
+}

docs/examples/fundamentals/variables.odcs.yaml

@@ -17,7 +17,7 @@ servers:
     environment: prod
     type: postgresql
     host: ${DB_HOST}
-    port: 5432
+    port: ${DB_PORT:-5432}
     database: ${DB_NAME:-orders}
     schema: ${DB_SCHEMA:-public}
 

docs/examples/server/exasol-server.odcs.yaml

@@ -0,0 +1,25 @@
+# Copyright 2026 The Bitol Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+# Demonstrates RFC-0058: the `exasol` server type for Exasol, an in-memory MPP
+# analytics database. An Exasol cluster runs a single database, so the schema is
+# the namespace and there is no `database` field.
+
+version: 1.0.0
+apiVersion: v3.2.0
+kind: DataContract
+id: 5c9a1e73-8d24-4f60-b1a7-6e0c3b5d9f42
+status: active
+servers:
+  - server: prod
+    type: exasol
+    host: exasol.acme.com
+    port: 8563
+    schema: SALES
+schema:
+  - name: sales
+    physicalType: table
+    properties:
+      - name: sale_id
+        logicalType: string
+        required: true

docs/variables.md

@@ -24,7 +24,7 @@ servers:
     environment: prod
     type: postgresql
     host: ${DB_HOST}
-    port: 5432
+    port: ${DB_PORT:-5432}
     database: ${DB_NAME:-orders}
     schema: ${DB_SCHEMA:-public}
 ```
@@ -53,7 +53,8 @@ quality:
 
 ## Notes
 
-* Interpolation applies to **string** values only. A field typed as an integer or boolean in the JSON schema (such as a server `port`) cannot hold a variable reference: the unresolved token is a string and the schema rejects it.
+* Interpolation applies to **string** values only. A field typed as an integer or boolean in the JSON schema cannot hold a variable reference: the unresolved token is a string and the schema rejects it.
+* The server `port` is an exception: the schema accepts an integer or a string, so it can hold a variable reference such as `${DB_PORT}` or `${DB_PORT:-5432}`.
 * No new section or field is added to the standard: a contract using variables validates against the standard JSON schema as-is.
 
 [Back to TOC](README.md)

schema/odcs-json-schema-latest.json

@@ -217,6 +217,10 @@
       "description": "Stable technical identifier for references. Must be unique within its containing array. Cannot contain special characters ('-', '_' allowed).",
       "pattern": "^[A-Za-z0-9_-]+$"
     },
+    "Port": {
+      "type": ["integer", "string"],
+      "description": "A network port: an integer, or a string, e.g. to hold a variable reference such as ${DB_PORT} resolved at runtime (RFC 0050)."
+    },
     "Server": {
       "type": "object",
       "description": "Data source details of where data is physically stored.",
@@ -233,7 +237,7 @@
           "description": "Type of the server.",
           "enum": [
             "api", "athena", "azure", "bigquery", "clickhouse", "databricks", "denodo", "dremio",
-            "duckdb", "glue", "hana", "cloudsql", "db2", "hive", "iceberg", "impala", "informix", "kafka", "kinesis", "local",
+            "duckdb", "exasol", "glue", "hana", "cloudsql", "db2", "hive", "iceberg", "impala", "informix", "kafka", "kinesis", "local",
             "mysql", "oracle", "postgresql", "postgres", "presto", "pubsub",
             "redshift", "s3", "sftp", "snowflake", "sqlserver", "synapse", "trino", "vertica", "zen", "custom"
           ]
@@ -376,6 +380,19 @@
             "$ref": "#/$defs/ServerSource/DuckdbServer"
           }
         },
+        {
+          "if": {
+            "properties": {
+              "type": {
+                "const": "exasol"
+              }
+            },
+            "required": ["type"]
+          },
+          "then": {
+            "$ref": "#/$defs/ServerSource/ExasolServer"
+          }
+        },
         {
           "if": {
             "properties": {
@@ -859,7 +876,7 @@
             "description": "The host of the ClickHouse server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the ClickHouse server."
           },
           "database": {
@@ -907,7 +924,7 @@
             "description": "The host of the Denodo server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the Denodo server."
           },
           "database": {
@@ -929,7 +946,7 @@
             "description": "The host of the Dremio server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the Dremio server."
           },
           "schema": {
@@ -959,6 +976,35 @@
           "database"
         ]
       },
+      "ExasolServer": {
+        "type": "object",
+        "title": "ExasolServer",
+        "properties": {
+          "host": {
+            "type": "string",
+            "description": "Host of the Exasol server. May be a cluster connection range.",
+            "examples": [
+              "exasol.acme.com",
+              "n11..14.acme.com"
+            ]
+          },
+          "port": {
+            "$ref": "#/$defs/Port",
+            "description": "Port of the Exasol server.",
+            "default": 8563,
+            "examples": [
+              8563
+            ]
+          },
+          "schema": {
+            "type": "string",
+            "description": "Name of the schema."
+          }
+        },
+        "required": [
+          "host"
+        ]
+      },
       "GlueServer": {
         "type": "object",
         "title": "GlueServer",
@@ -1020,7 +1066,7 @@
             "description": "The host of the Google Cloud Sql server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the Google Cloud Sql server."
           },
           "database": {
@@ -1048,7 +1094,7 @@
             "description": "The host of the IBM DB2 server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the IBM DB2 server."
           },
           "database": {
@@ -1075,7 +1121,7 @@
             "description": "The host to the Hive server. "
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the Hive server. Defaults to 10000."
           },
           "database": {
@@ -1097,7 +1143,7 @@
             "description": "The host to the Impala server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the Impala server. Defaults to 21050."
           },
           "database": {
@@ -1119,7 +1165,7 @@
             "description": "The host to the Informix server. "
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the Informix server. Defaults to 9088."
           },
           "database": {
@@ -1141,7 +1187,7 @@
             "description": "Hostname or IP address of the Zen server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "Zen server SQL connections port. Defaults to 1583."
           },
           "database": {
@@ -1208,7 +1254,7 @@
             "description": "Relative or absolute path to the data file(s)."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "Port to the server. No default value is assumed for custom servers."
           },
           "project": {
@@ -1355,7 +1401,7 @@
             "description": "The host of the MySql server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the MySql server."
           },
           "database": {
@@ -1381,7 +1427,7 @@
             ]
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the oracle server.",
             "examples": [
               1523
@@ -1410,7 +1456,7 @@
             "description": "The host to the Postgres server"
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the Postgres server."
           },
           "database": {
@@ -1438,7 +1484,7 @@
             "description": "Host of the HANA server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "Port of the HANA server."
           },
           "database": {
@@ -1664,7 +1710,7 @@
             "description": "The host to the Snowflake server"
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the Snowflake server."
           },
           "account": {
@@ -1702,7 +1748,7 @@
             ]
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port to the database server.",
             "default": 1433,
             "examples": [
@@ -1739,7 +1785,7 @@
             "description": "The host of the Synapse server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the Synapse server."
           },
           "database": {
@@ -1765,7 +1811,7 @@
             ]
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The Trino port."
           },
           "catalog": {
@@ -1799,7 +1845,7 @@
             "description": "The host of the Vertica server."
           },
           "port": {
-            "type": "integer",
+            "$ref": "#/$defs/Port",
             "description": "The port of the Vertica server."
           },
           "database": {