MINOR: Removed supportsDDL from json schemas (open-metadata#16171)

HuanjieGuo · May 10, 2024 · 0e2736e · 0e2736e
1 parent 3db9dad
commit 0e2736e
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 52 deletions.
diff --git a/ingestion/src/metadata/ingestion/source/database/bigquery/metadata.py b/ingestion/src/metadata/ingestion/source/database/bigquery/metadata.py
@@ -630,7 +630,9 @@ def get_schema_definition(
                 self.connection, table_name, schema_name
             )
             schema_definition = (
-                str(schema_definition) if schema_definition is not None else None
+                str(schema_definition.strip())
+                if schema_definition is not None
+                else None
             )
             return schema_definition
         except NotImplementedError:

diff --git a/ingestion/src/metadata/ingestion/source/database/clickhouse/metadata.py b/ingestion/src/metadata/ingestion/source/database/clickhouse/metadata.py
@@ -161,7 +161,9 @@ def get_schema_definition(
                     self.connection, table_name, schema_name
                 )
             schema_definition = (
-                str(schema_definition) if schema_definition is not None else None
+                str(schema_definition.strip())
+                if schema_definition is not None
+                else None
             )
             return schema_definition
 

diff --git a/ingestion/src/metadata/ingestion/source/database/common_db_source.py b/ingestion/src/metadata/ingestion/source/database/common_db_source.py
@@ -366,16 +366,19 @@ def get_schema_definition(
         Get the DDL statement or View Definition for a table
         """
         try:
+            schema_definition = None
             if table_type in (TableType.View, TableType.MaterializedView):
                 schema_definition = inspector.get_view_definition(
                     table_name, schema_name
                 )
-            else:
+            elif hasattr(inspector, "get_table_ddl"):
                 schema_definition = inspector.get_table_ddl(
                     self.connection, table_name, schema_name
                 )
             schema_definition = (
-                str(schema_definition) if schema_definition is not None else None
+                str(schema_definition).strip()
+                if schema_definition is not None
+                else None
             )
             return schema_definition
 

diff --git a/ingestion/src/metadata/ingestion/source/database/hive/metadata.py b/ingestion/src/metadata/ingestion/source/database/hive/metadata.py
@@ -108,7 +108,9 @@ def get_schema_definition(  # pylint: disable=unused-argument
         try:
             schema_definition = inspector.get_view_definition(table_name, schema_name)
             schema_definition = (
-                str(schema_definition) if schema_definition is not None else None
+                str(schema_definition).strip()
+                if schema_definition is not None
+                else None
             )
             return schema_definition
 

diff --git a/ingestion/src/metadata/ingestion/source/database/oracle/metadata.py b/ingestion/src/metadata/ingestion/source/database/oracle/metadata.py
@@ -163,7 +163,9 @@ def get_schema_definition(
                 schema_definition = definition_fn(table_name, schema_name)
 
             schema_definition = (
-                str(schema_definition) if schema_definition is not None else None
+                str(schema_definition.strip())
+                if schema_definition is not None
+                else None
             )
             return schema_definition
 

diff --git a/ingestion/tests/unit/topology/metadata/test_amundsen.py b/ingestion/tests/unit/topology/metadata/test_amundsen.py
@@ -82,7 +82,6 @@
                 connectionArguments=None,
                 supportsMetadataExtraction=True,
                 supportsProfiler=True,
-                supportsDDL=True,
                 supportsDBTExtraction=True,
             )
         ),

diff --git a/...-spec/src/main/resources/json/schema/entity/services/connections/connectionBasicType.json b/...-spec/src/main/resources/json/schema/entity/services/connections/connectionBasicType.json
@@ -40,11 +40,6 @@
       "type": "boolean",
       "default": true
     },
-    "supportsDDL": {
-      "description": "Supports DDL",
-      "type": "boolean",
-      "default": true
-    },
     "supportsDatabase": {
       "description": "The source service supports the database concept in its hierarchy",
       "type": "boolean",

diff --git a/...c/main/resources/json/schema/entity/services/connections/database/bigQueryConnection.json b/...c/main/resources/json/schema/entity/services/connections/database/bigQueryConnection.json
@@ -93,10 +93,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"

diff --git a/...main/resources/json/schema/entity/services/connections/database/clickhouseConnection.json b/...main/resources/json/schema/entity/services/connections/database/clickhouseConnection.json
@@ -103,10 +103,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsQueryComment": {
       "title": "Supports Query Comment",
       "$ref": "../connectionBasicType.json#/definitions/supportsQueryComment"

diff --git a/...main/resources/json/schema/entity/services/connections/database/databricksConnection.json b/...main/resources/json/schema/entity/services/connections/database/databricksConnection.json
@@ -89,10 +89,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"

diff --git a/...c/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json b/...c/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json
@@ -111,10 +111,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "sampleDataStorageConfig": {
       "title": "Storage Config for Sample Data",
       "$ref": "../connectionBasicType.json#/definitions/sampleDataStorageConfig"

diff --git a/.../src/main/resources/json/schema/entity/services/connections/database/mssqlConnection.json b/.../src/main/resources/json/schema/entity/services/connections/database/mssqlConnection.json
@@ -84,10 +84,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"

diff --git a/.../src/main/resources/json/schema/entity/services/connections/database/mysqlConnection.json b/.../src/main/resources/json/schema/entity/services/connections/database/mysqlConnection.json
@@ -99,10 +99,6 @@
       "title": "Supports Query Comment",
       "$ref": "../connectionBasicType.json#/definitions/supportsQueryComment"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "sampleDataStorageConfig": {
       "title": "Storage Config for Sample Data",
       "$ref": "../connectionBasicType.json#/definitions/sampleDataStorageConfig"

diff --git a/...src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json b/...src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json
@@ -136,10 +136,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsQueryComment": {
       "title": "Supports Query Comment",
       "$ref": "../connectionBasicType.json#/definitions/supportsQueryComment"

diff --git a/...c/main/resources/json/schema/entity/services/connections/database/postgresConnection.json b/...c/main/resources/json/schema/entity/services/connections/database/postgresConnection.json
@@ -110,10 +110,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"

diff --git a/...c/main/resources/json/schema/entity/services/connections/database/redshiftConnection.json b/...c/main/resources/json/schema/entity/services/connections/database/redshiftConnection.json
@@ -94,10 +94,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"

diff --git a/.../main/resources/json/schema/entity/services/connections/database/snowflakeConnection.json b/.../main/resources/json/schema/entity/services/connections/database/snowflakeConnection.json
@@ -117,10 +117,6 @@
       "title": "Supports Profiler",
       "$ref": "../connectionBasicType.json#/definitions/supportsProfiler"
     },
-    "supportsDDL": {
-      "title": "Supports DDL",
-      "$ref": "../connectionBasicType.json#/definitions/supportsDDL"
-    },
     "supportsDatabase": {
       "title": "Supports Database",
       "$ref": "../connectionBasicType.json#/definitions/supportsDatabase"