Skip to content
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

[Fix] Fix Oracle type converter handle negative scale in number type #6758

Merged
merged 4 commits into from
Apr 28, 2024
Merged

[Fix] Fix Oracle type converter handle negative scale in number type #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
953635a
[Fix] Fix Oracle type converter handle negative scale in number type
Hisoka-X Apr 25, 2024
d3264fc
update
Hisoka-X Apr 26, 2024
72e7a03
update
Hisoka-X Apr 26, 2024
857161c
update
Hisoka-X Apr 26, 2024
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
17 changes: 9 additions & 8 deletions ...ache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,22 @@ public Column convert(BasicTypeDefine typeDefine) {
scale = 127;
}

if (scale == 0) {
if (precision == 1) {
if (scale <= 0) {
int newPrecision = (int) (precision - scale);
if (newPrecision == 1) {
builder.dataType(BasicType.BOOLEAN_TYPE);
} else if (precision <= 9) {
} else if (newPrecision <= 9) {
builder.dataType(BasicType.INT_TYPE);
} else if (precision <= 18) {
} else if (newPrecision <= 18) {
builder.dataType(BasicType.LONG_TYPE);
} else if (precision < 38) {
builder.dataType(new DecimalType(precision.intValue(), 0));
builder.columnLength(precision);
} else if (newPrecision < 38) {
builder.dataType(new DecimalType(newPrecision, 0));
builder.columnLength((long) newPrecision);
} else {
builder.dataType(new DecimalType(DEFAULT_PRECISION, 0));
builder.columnLength((long) DEFAULT_PRECISION);
}
} else if (scale > 0 && scale <= DEFAULT_SCALE) {
} else if (scale <= DEFAULT_SCALE) {
builder.dataType(new DecimalType(precision.intValue(), scale));
builder.columnLength(precision);
builder.scale(scale);
Expand Down
55 changes: 55 additions & 0 deletions .../seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleTypeConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,4 +754,59 @@ public void testReconvertDatetime() {
typeDefine.getDataType());
Assertions.assertEquals(column.getScale(), typeDefine.getScale());
}

@Test
public void testNumberWithNegativeScale() {
BasicTypeDefine<Object> typeDefine =
BasicTypeDefine.builder()
.name("test")
.columnType("number(38,-1)")
.dataType("number")
.precision(38L)
.scale(-1)
.build();
Column column = OracleTypeConverter.INSTANCE.convert(typeDefine);
Assertions.assertEquals(typeDefine.getName(), column.getName());
Assertions.assertEquals(new DecimalType(38, 0), column.getDataType());
Assertions.assertEquals(typeDefine.getColumnType(), column.getSourceType());

typeDefine =
BasicTypeDefine.builder()
.name("test")
.columnType("number(5,-2)")
.dataType("number")
.precision(5L)
.scale(-2)
.build();
column = OracleTypeConverter.INSTANCE.convert(typeDefine);
Assertions.assertEquals(typeDefine.getName(), column.getName());
Assertions.assertEquals(BasicType.INT_TYPE, column.getDataType());
Assertions.assertEquals(typeDefine.getColumnType(), column.getSourceType());

typeDefine =
BasicTypeDefine.builder()
.name("test")
.columnType("number(9,-2)")
.dataType("number")
.precision(9L)
.scale(-2)
.build();
column = OracleTypeConverter.INSTANCE.convert(typeDefine);
Assertions.assertEquals(typeDefine.getName(), column.getName());
Assertions.assertEquals(BasicType.LONG_TYPE, column.getDataType());
Assertions.assertEquals(typeDefine.getColumnType(), column.getSourceType());

typeDefine =
BasicTypeDefine.builder()
.name("test")
.columnType("number(14,-11)")
.dataType("number")
.precision(14L)
.scale(-11)
.build();
column = OracleTypeConverter.INSTANCE.convert(typeDefine);
Assertions.assertEquals(typeDefine.getName(), column.getName());
Assertions.assertEquals(new DecimalType(25, 0), column.getDataType());
Assertions.assertEquals(typeDefine.getColumnType(), column.getSourceType());
}
}
3 changes: 3 additions & 0 deletions ...e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOracleIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class JdbcOracleIT extends AbstractJdbcIT {
+ " CHAR_10_COL char(10),\n"
+ " CLOB_COL clob,\n"
+ " NUMBER_3_SF_2_DP number(3, 2),\n"
+ " NUMBER_7_SF_N2_DP number(7, -2),\n"
+ " INTEGER_COL integer,\n"
+ " FLOAT_COL float(10),\n"
+ " REAL_COL real,\n"
Expand All @@ -90,6 +91,7 @@ public class JdbcOracleIT extends AbstractJdbcIT {
"CHAR_10_COL",
"CLOB_COL",
"NUMBER_3_SF_2_DP",
"NUMBER_7_SF_N2_DP",
"INTEGER_COL",
"FLOAT_COL",
"REAL_COL",
Expand Down Expand Up @@ -170,6 +172,7 @@ Pair<String[], List<SeaTunnelRow>> initTestData() {
String.format("f%s", i),
String.format("f%s", i),
BigDecimal.valueOf(1.1),
BigDecimal.valueOf(2400),
i,
Float.parseFloat("2.2"),
Float.parseFloat("2.2"),
Expand Down
4 changes: 2 additions & 2 deletions ...tor-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/resources/jdbc_oracle_source_to_sink.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ source {
url = "jdbc:oracle:thin:@e2e_oracleDb:1521/TESTUSER"
user = testUser
password = testPassword
query = "SELECT VARCHAR_10_COL,CHAR_10_COL,CLOB_COL,NUMBER_3_SF_2_DP,INTEGER_COL,FLOAT_COL,REAL_COL,BINARY_FLOAT_COL,BINARY_DOUBLE_COL,DATE_COL,TIMESTAMP_WITH_3_FRAC_SEC_COL,TIMESTAMP_WITH_LOCAL_TZ,XML_TYPE_COL FROM E2E_TABLE_SOURCE"
query = "SELECT VARCHAR_10_COL,CHAR_10_COL,CLOB_COL,NUMBER_3_SF_2_DP,NUMBER_7_SF_N2_DP,INTEGER_COL,FLOAT_COL,REAL_COL,BINARY_FLOAT_COL,BINARY_DOUBLE_COL,DATE_COL,TIMESTAMP_WITH_3_FRAC_SEC_COL,TIMESTAMP_WITH_LOCAL_TZ,XML_TYPE_COL FROM E2E_TABLE_SOURCE"
properties {
database.oracle.jdbc.timezoneAsRegion = "false"
}
Expand All @@ -46,7 +46,7 @@ sink {
url = "jdbc:oracle:thin:@e2e_oracleDb:1521/TESTUSER"
user = testUser
password = testPassword
query = "INSERT INTO E2E_TABLE_SINK (VARCHAR_10_COL,CHAR_10_COL,CLOB_COL,NUMBER_3_SF_2_DP,INTEGER_COL,FLOAT_COL,REAL_COL,BINARY_FLOAT_COL,BINARY_DOUBLE_COL,DATE_COL,TIMESTAMP_WITH_3_FRAC_SEC_COL,TIMESTAMP_WITH_LOCAL_TZ,XML_TYPE_COL) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)"
query = "INSERT INTO E2E_TABLE_SINK (VARCHAR_10_COL,CHAR_10_COL,CLOB_COL,NUMBER_3_SF_2_DP,NUMBER_7_SF_N2_DP,INTEGER_COL,FLOAT_COL,REAL_COL,BINARY_FLOAT_COL,BINARY_DOUBLE_COL,DATE_COL,TIMESTAMP_WITH_3_FRAC_SEC_COL,TIMESTAMP_WITH_LOCAL_TZ,XML_TYPE_COL) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
properties {
database.oracle.jdbc.timezoneAsRegion = "false"
}
Expand Down
Loading