diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json index c6da5c09fa1..1ce25d73dbf 100644 --- a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json +++ b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/oracleConnection.json @@ -19,7 +19,7 @@ "default": "oracle+cx_oracle" }, "OracleDatabaseSchema": { - "title": "DatabaseSchema", + "title": "Database Schema", "properties": { "databaseSchema": { "title": "DatabaseSchema", @@ -34,7 +34,7 @@ "properties": { "oracleServiceName": { "title": "Oracle Service Name", - "description": "Oracle Service Name to be passed. Note: either Database or Oracle service name can be sent, not both.", + "description": "The Oracle Service name is the TNS alias that you give when you remotely connect to your database.", "type": "string" } }, @@ -76,10 +76,10 @@ "description": "Connect with oracle by either passing service name or database schema name.", "oneOf": [ { - "$ref": "#/definitions/OracleDatabaseSchema" + "$ref": "#/definitions/OracleServiceName" }, { - "$ref": "#/definitions/OracleServiceName" + "$ref": "#/definitions/OracleDatabaseSchema" } ] }, diff --git a/openmetadata-docs/content/openmetadata/connectors/database/oracle/airflow.md b/openmetadata-docs/content/openmetadata/connectors/database/oracle/airflow.md index 32242c1bce5..752121f25f9 100644 --- a/openmetadata-docs/content/openmetadata/connectors/database/oracle/airflow.md +++ b/openmetadata-docs/content/openmetadata/connectors/database/oracle/airflow.md @@ -140,7 +140,9 @@ workflowConfig: - **username**: Specify the User to connect to Oracle. It should have enough privileges to read all the metadata. - **password**: Password to connect to Oracle. - **hostPort**: Enter the fully qualified hostname and port number for your Oracle deployment in the Host and Port field. -- **oracleServiceName**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. +- **oracleConnectionType** : + - **oracleServiceName**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. + - **databaseSchema**: The name of the database schema available in Oracle that you want to connect with. - **Connection Options (Optional)**: Enter the details for any additional connection options that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - **Connection Arguments (Optional)**: Enter the details for any additional connection arguments such as security or protocol configs that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - In case you are using Single-Sign-On (SSO) for authentication, add the `authenticator` details in the Connection Arguments as a Key-Value pair as follows: `"authenticator" : "sso_login_url"` diff --git a/openmetadata-docs/content/openmetadata/connectors/database/oracle/cli.md b/openmetadata-docs/content/openmetadata/connectors/database/oracle/cli.md index 57192a5b50e..0ad14239974 100644 --- a/openmetadata-docs/content/openmetadata/connectors/database/oracle/cli.md +++ b/openmetadata-docs/content/openmetadata/connectors/database/oracle/cli.md @@ -140,7 +140,9 @@ workflowConfig: - **username**: Specify the User to connect to Oracle. It should have enough privileges to read all the metadata. - **password**: Password to connect to Oracle. - **hostPort**: Enter the fully qualified hostname and port number for your Oracle deployment in the Host and Port field. -- **oracleServiceName**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. +- **oracleConnectionType**: + - **oracleServiceName**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. + - **databaseSchema**: The name of the database schema available in Oracle that you want to connect with. - **Connection Options (Optional)**: Enter the details for any additional connection options that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - **Connection Arguments (Optional)**: Enter the details for any additional connection arguments such as security or protocol configs that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - In case you are using Single-Sign-On (SSO) for authentication, add the `authenticator` details in the Connection Arguments as a Key-Value pair as follows: `"authenticator" : "sso_login_url"` diff --git a/openmetadata-docs/content/openmetadata/connectors/database/oracle/index.md b/openmetadata-docs/content/openmetadata/connectors/database/oracle/index.md index 61c05a0f5c5..97bb401f576 100644 --- a/openmetadata-docs/content/openmetadata/connectors/database/oracle/index.md +++ b/openmetadata-docs/content/openmetadata/connectors/database/oracle/index.md @@ -134,7 +134,9 @@ the changes. - **Username**: Specify the User to connect to Oracle. It should have enough privileges to read all the metadata. - **Password**: Password to connect to Oracle. - **Host and Port**: Enter the fully qualified hostname and port number for your Oracle deployment in the Host and Port field. -- **Oracle Service Name**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. +- **Oracle Connection Type** : Select the Oracle Connection Type. The type can either be `Oracle Service Name` or `Database Schema` + - **Oracle Service Name**: The Oracle Service name is the TNS alias that you give when you remotely connect to your database and this Service name is recorded in tnsnames. + - **Database Schema**: The name of the database schema available in Oracle that you want to connect with. - **Connection Options (Optional)**: Enter the details for any additional connection options that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - **Connection Arguments (Optional)**: Enter the details for any additional connection arguments such as security or protocol configs that can be sent to Oracle during the connection. These details must be added as Key-Value pairs. - In case you are using Single-Sign-On (SSO) for authentication, add the `authenticator` details in the Connection Arguments as a Key-Value pair as follows: `"authenticator" : "sso_login_url"` diff --git a/openmetadata-docs/images/openmetadata/connectors/oracle/service-connection.png b/openmetadata-docs/images/openmetadata/connectors/oracle/service-connection.png index 7d809f04be7..1d20a758147 100644 Binary files a/openmetadata-docs/images/openmetadata/connectors/oracle/service-connection.png and b/openmetadata-docs/images/openmetadata/connectors/oracle/service-connection.png differ