Skip to content

[PLUGIN-1955] Provide XML column type support for oracle plugin #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanshikaagupta22 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[PLUGIN-1955] Provide XML column type support for oracle plugin #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions oracle-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,16 @@
<version>21.1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.xml</groupId>
<artifactId>xdb</artifactId>
<version>21.1.0.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.xml</groupId>
<artifactId>xmlparserv2</artifactId>
<version>21.1.0.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
1 change: 1 addition & 0 deletions oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceDBRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ private void handleOracleSpecificType(ResultSet resultSet, StructuredRecord.Buil
switch (sqlType) {
case OracleSourceSchemaReader.INTERVAL_YM:
case OracleSourceSchemaReader.INTERVAL_DS:
case OracleSourceSchemaReader.XML:
case OracleSourceSchemaReader.LONG:
case Types.NCLOB:
recordBuilder.set(field.getName(), resultSet.getString(columnIndex));
Expand Down
3 changes: 3 additions & 0 deletions oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceSchemaReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class OracleSourceSchemaReader extends CommonSchemaReader {
public static final int BINARY_DOUBLE = 101;
public static final int BFILE = -13;
public static final int LONG = -1;
public static final int XML = 2009;
public static final int LONG_RAW = -4;

/**
Expand All @@ -61,6 +62,7 @@ public class OracleSourceSchemaReader extends CommonSchemaReader {
BINARY_DOUBLE,
BFILE,
LONG,
XML,
LONG_RAW,
Types.NUMERIC,
Types.DECIMAL
Expand Down Expand Up @@ -102,6 +104,7 @@ public Schema getSchema(ResultSetMetaData metadata, int index) throws SQLExcepti
return Schema.of(Schema.Type.BYTES);
case INTERVAL_DS:
case INTERVAL_YM:
case XML:
case LONG:
return Schema.of(Schema.Type.STRING);
case Types.NUMERIC:
Expand Down
18 changes: 18 additions & 0 deletions oracle-plugin/src/test/java/io/cdap/plugin/oracle/OracleSchemaReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,22 @@ public void getSchema_timestampLTZFieldFalse_returnDatetime() throws SQLExceptio
Assert.assertEquals(expectedSchemaFields.get(1).getName(), actualSchemaFields.get(1).getName());
Assert.assertEquals(expectedSchemaFields.get(1).getSchema(), actualSchemaFields.get(1).getSchema());
}

@Test
public void getSchema_xmlField_returnString() throws SQLException {
OracleSourceSchemaReader schemaReader = new OracleSourceSchemaReader(null, false, false, false);
ResultSet resultSet = Mockito.mock(ResultSet.class);
ResultSetMetaData metadata = Mockito.mock(ResultSetMetaData.class);
Mockito.when(resultSet.getMetaData()).thenReturn(metadata);
Mockito.when(metadata.getColumnCount()).thenReturn(1);
Mockito.when(metadata.getColumnType(1)).thenReturn(OracleSourceSchemaReader.XML);
Mockito.when(metadata.getColumnName(1)).thenReturn("xmlData");

List<Schema.Field> actualSchemaFields = schemaReader.getSchemaFields(resultSet);

List<Schema.Field> expectedSchemaFields = Lists.newArrayList();
expectedSchemaFields.add(Schema.Field.of("xmlData", Schema.of(Schema.Type.STRING)));
Assert.assertEquals(expectedSchemaFields.get(0).getName(), actualSchemaFields.get(0).getName());
Assert.assertEquals(expectedSchemaFields.get(0).getSchema(), actualSchemaFields.get(0).getSchema());
}
}