Skip to content

CDAP-19389: Show correct SQL Datetime type for source table during Assessment #218

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

Merged
merged 1 commit into from
Dec 1, 2022
Merged

CDAP-19389: Show correct SQL Datetime type for source table during Assessment #218

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
4 changes: 3 additions & 1 deletion sqlserver-delta-plugins/src/main/java/io/cdap/delta/sqlserver/SqlServerTableAssessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public TableAssessment assess(TableDetail tableDetail) {
static ColumnEvaluation evaluateColumn(ColumnDetail detail) throws IllegalArgumentException {
Schema schema;
int sqlType = detail.getType().getVendorTypeNumber();
String sqlTypeName = detail.getType().getName();
Map<String, String> properties = detail.getProperties();
String upperCaseTypeName = properties.get(TYPE_NAME).toUpperCase();
ColumnSupport support = ColumnSupport.YES;
Expand Down Expand Up @@ -118,6 +119,7 @@ static ColumnEvaluation evaluateColumn(ColumnDetail detail) throws IllegalArgume
break;
case Types.TIMESTAMP:
schema = Schema.of(Schema.LogicalType.DATETIME);
sqlTypeName = upperCaseTypeName;
if (DATETIME2.equals(upperCaseTypeName)) {
scale = Integer.parseInt(properties.get(SCALE));
if (scale > MAX_SUPPORTED_SCALE) {
Expand Down Expand Up @@ -161,7 +163,7 @@ static ColumnEvaluation evaluateColumn(ColumnDetail detail) throws IllegalArgume

Schema.Field field = schema == null ? null :
Schema.Field.of(detail.getName(), detail.isNullable() ? Schema.nullableOf(schema) : schema);
ColumnAssessment assessment = ColumnAssessment.builder(detail.getName(), detail.getType().getName())
ColumnAssessment assessment = ColumnAssessment.builder(detail.getName(), sqlTypeName)
.setSupport(support)
.setSuggestion(suggestion)
.build();
Expand Down
11 changes: 8 additions & 3 deletions ...erver-delta-plugins/src/test/java/io.cdap.delta.sqlserver/SqlServerTableAssessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package io.cdap.delta.sqlserver;

import io.cdap.cdap.api.data.schema.Schema;
import io.cdap.delta.api.assessment.ColumnAssessment;
import io.cdap.delta.api.assessment.ColumnDetail;
import io.cdap.delta.api.assessment.ColumnSupport;
import io.cdap.delta.api.assessment.TableAssessment;
Expand Down Expand Up @@ -56,10 +57,12 @@ public void testDateTime2WithNanoScaleMapping() {
ColumnEvaluation columnEvaluation = SqlServerTableAssessor.evaluateColumn(columnDetail);
TableAssessment assessment = tableAssessor.assess(tableDetail);

Assert.assertEquals(1, assessment.getColumns().size());
ColumnAssessment columnAssessment = assessment.getColumns().get(0);
Assert.assertEquals(SqlServerTableAssessor.DATETIME2, columnAssessment.getType());
Assert.assertEquals(ColumnSupport.PARTIAL, columnAssessment.getSupport());
Assert.assertEquals(Schema.LogicalType.DATETIME,
columnEvaluation.getField().getSchema().getNonNullable().getLogicalType());
Assert.assertEquals(1, assessment.getColumns().size());
Assert.assertEquals(ColumnSupport.PARTIAL, assessment.getColumns().get(0).getSupport());
}

@Test
Expand Down Expand Up @@ -94,7 +97,9 @@ public void testDateTimeMapping() {
Assert.assertEquals(Schema.LogicalType.DATETIME,
columnEvaluation.getField().getSchema().getNonNullable().getLogicalType());
Assert.assertEquals(1, assessment.getColumns().size());
Assert.assertEquals(ColumnSupport.YES, assessment.getColumns().get(0).getSupport());
ColumnAssessment columnAssessment = assessment.getColumns().get(0);
Assert.assertEquals(DATETIME, columnAssessment.getType());
Assert.assertEquals(ColumnSupport.YES, columnAssessment.getSupport());
}

@Test
Expand Down