Skip to content

NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue #7355

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

Closed
mattyb149 wants to merge 1 commit into from
Closed

NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue #7355

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
1 change: 1 addition & 0 deletions ...ns/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2150,6 +2150,7 @@ public static int getSQLTypeValue(final DataType dataType) {
case SHORT:
return Types.SMALLINT;
case STRING:
case UUID:
return Types.VARCHAR;
case ENUM:
return Types.OTHER;
Expand Down
42 changes: 42 additions & 0 deletions ...d-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ public class PutDatabaseRecordTest {
private static final String createPersonsSchema2 = "CREATE TABLE SCHEMA2.PERSONS (id2 integer primary key, name varchar(100)," +
" code integer CONSTRAINT CODE_RANGE CHECK (code >= 0 AND code < 1000), dt date)";

private static final String createUUIDSchema = "CREATE TABLE UUID_TEST (id integer primary key, name VARCHAR(100))";

private final static String DB_LOCATION = "target/db_pdr";

TestRunner runner;
Expand Down Expand Up @@ -1802,6 +1804,46 @@ void testInsertEnum() throws InitializationException, ProcessException, SQLExcep
conn.close();
}

@Test
void testInsertUUIDColumn() throws InitializationException, ProcessException, SQLException {
// Manually create and drop the tables and schemas
final Connection conn = dbcp.getConnection();
final Statement stmt = conn.createStatement();
stmt.execute(createUUIDSchema);

final MockRecordParser parser = new MockRecordParser();
runner.addControllerService("parser", parser);
runner.enableControllerService(parser);

parser.addSchemaField("id", RecordFieldType.INT);
parser.addSchemaField("name", RecordFieldType.UUID);

parser.addRecord(1, "425085a0-03ef-11ee-be56-0242ac120002");
parser.addRecord(2, "56a000e4-03ef-11ee-be56-0242ac120002");

runner.setProperty(PutDatabaseRecord.RECORD_READER_FACTORY, "parser");
runner.setProperty(PutDatabaseRecord.STATEMENT_TYPE, PutDatabaseRecord.INSERT_TYPE);
runner.setProperty(PutDatabaseRecord.TABLE_NAME, "UUID_TEST");

runner.enqueue(new byte[0]);
runner.run();

runner.assertTransferCount(PutDatabaseRecord.REL_SUCCESS, 1);
ResultSet rs = stmt.executeQuery("SELECT * FROM UUID_TEST");
assertTrue(rs.next());
assertEquals(1, rs.getInt(1));
assertEquals("425085a0-03ef-11ee-be56-0242ac120002", rs.getString(2));
assertTrue(rs.next());
assertEquals(2, rs.getInt(1));
assertEquals("56a000e4-03ef-11ee-be56-0242ac120002", rs.getString(2));
assertFalse(rs.next());

// Drop the schemas here so as not to interfere with other tests
stmt.execute("drop table UUID_TEST");
stmt.close();
conn.close();
}

private void recreateTable() throws ProcessException {
try (final Connection conn = dbcp.getConnection();
final Statement stmt = conn.createStatement()) {
Expand Down