Skip to content

Commit 39d2840

Browse files
Merge pull request data-integrations#674 from cloudsufi/hide-generic-fields-for-release
[Cherrypick] [oracle] hide internal configuration fields in sink UI
2 parents 5f84550 + 8c1ecee commit 39d2840

4 files changed

Lines changed: 82 additions & 2 deletions

File tree

‎oracle-plugin/src/e2e-test/features/sink/OracleDesignTimeValidation.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,14 @@ Feature: Oracle sink- Verify Oracle sink plugin design time validation scenarios
251251
Then Close the Plugin Properties page
252252
Then Navigate to the properties page of plugin: "Oracle2"
253253
Then Select dropdown plugin property: "select-jdbcPluginName" with option value: "driverName"
254-
Then Replace input plugin property: "port" with value: "port" for Credentials and Authorization related fields
255254
Then Replace input plugin property: "database" with value: "databaseName"
256255
Then Replace input plugin property: "tableName" with value: "targetTable"
257256
Then Replace input plugin property: "dbSchemaName" with value: "schema"
258257
Then Replace input plugin property: "user" with value: "username" for Credentials and Authorization related fields
259258
Then Enter input plugin property: "referenceName" with value: "targetRef"
260259
Then Select radio button plugin property: "connectionType" with value: "service"
261260
Then Select radio button plugin property: "role" with value: "normal"
261+
Then Replace input plugin property: "port" with value: "port" for Credentials and Authorization related fields
262262
Then Click on the Validate button
263263
Then Verify that the Plugin is displaying an error message: "blank.HostBlank.message" on the header
264264

‎oracle-plugin/src/e2e-test/resources/errorMessage.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ errorMessageInvalidHost=Exception while trying to validate schema of database ta
1818
errorLogsMessageInvalidBoundingQuery=Spark program 'phase-1' failed with error: Stage 'Oracle' encountered : \
1919
java.io.IOException: ORA-00936: missing expression . Please check the system logs for more details.
2020
blank.database.message=Required property 'database' has no value.
21-
blank.connection.message=Exception while trying to validate schema of database table
21+
blank.connection.message=Exception while trying to validate schema of database table
22+
blank.HostBlank.message=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08006', errorCode: '17002', errorMessage: SQL Exception occurred: [Message='IO Error: The Network Adapter could not establish the connection', SQLState='08006', ErrorCode='17002'].'
2223
errorMessageUpdateUpsertOperationName=Table key must be set if the operation is 'Update' or 'Upsert'.

‎oracle-plugin/src/e2e-test/resources/pluginParameters.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ host=ORACLE_HOST
77
port=ORACLE_PORT
88
username=ORACLE_USERNAME
99
password=ORACLE_PASSWORD
10+
connection.name=dummy
1011
outputSchema=[{"key":"ID","value":"decimal"},{"key":"LASTNAME","value":"string"}]
1112
datatypeColumns=(ID VARCHAR2(100) PRIMARY KEY, COL1 CHAR, COL2 CHAR(10), COL3 VARCHAR(3), COL4 VARCHAR2(3), \
1213
COL5 NCHAR, COL6 NCHAR(12), COL7 NVARCHAR2(12), COL8 CLOB, COL9 NCLOB, COL10 LONG, COL11 ROWID, COL12 NUMBER(4), \
@@ -94,6 +95,8 @@ numberOfSplits=2
9495
zeroValue=0
9596
splitByColumn=ID
9697
importQuery=where $CONDITIONS
98+
connectionArguments=queryTimeout=50
99+
transactionIsolationLevel=TRANSACTION_READ_COMMITTED
97100
operationName=update
98101
oracleTableKey=ID
99102
relationTableKey=ID

‎oracle-plugin/widgets/Oracle-batchsink.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,82 @@
120120
]
121121
}
122122
},
123+
{
124+
"widget-type": "hidden",
125+
"label": "Treat as old timestamp",
126+
"name": "treatAsOldTimestamp",
127+
"widget-attributes": {
128+
"layout": "inline",
129+
"default": "false",
130+
"options": [
131+
{
132+
"id": "true",
133+
"label": "true"
134+
},
135+
{
136+
"id": "false",
137+
"label": "false"
138+
}
139+
]
140+
}
141+
},
142+
{
143+
"widget-type": "hidden",
144+
"label": "Treat precision less number as Decimal(old behavior)",
145+
"name": "treatPrecisionlessNumAsDeci",
146+
"widget-attributes": {
147+
"layout": "inline",
148+
"default": "false",
149+
"options": [
150+
{
151+
"id": "true",
152+
"label": "true"
153+
},
154+
{
155+
"id": "false",
156+
"label": "false"
157+
}
158+
]
159+
}
160+
},
161+
{
162+
"widget-type": "hidden",
163+
"label": "Treat Timestamp_LTZ as Timestamp",
164+
"name": "treatTimestampLTZAsTimestamp",
165+
"widget-attributes": {
166+
"layout": "inline",
167+
"default": "false",
168+
"options": [
169+
{
170+
"id": "true",
171+
"label": "true"
172+
},
173+
{
174+
"id": "false",
175+
"label": "false"
176+
}
177+
]
178+
}
179+
},
180+
{
181+
"widget-type": "hidden",
182+
"label": "Enable Xml Type",
183+
"name": "enableXmlType",
184+
"widget-attributes": {
185+
"layout": "inline",
186+
"default": "false",
187+
"options": [
188+
{
189+
"id": "true",
190+
"label": "true"
191+
},
192+
{
193+
"id": "false",
194+
"label": "false"
195+
}
196+
]
197+
}
198+
},
123199
{
124200
"name": "connectionType",
125201
"label": "Connection Type",

0 commit comments

Comments
 (0)