Skip to content

Remove unnecessary complexity in db utils Table/ColumnDefBuilder #524

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
prb112 merged 1 commit into from
Dec 20, 2019
Merged

Remove unnecessary complexity in db utils Table/ColumnDefBuilder #524

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
6 changes: 1 addition & 5 deletions fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,7 @@ protected List<ColumnBase> buildColumns() {
column = new DoubleColumn(cd.getName(), cd.isNullable());
break;
case TIMESTAMP:
if (cd.getPrecision() == null) {
column = new TimestampColumn(cd.getName(), cd.isNullable());
} else {
column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
}
column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
break;
case VARCHAR:
if (cd.getSize() > Integer.MAX_VALUE) {
Expand Down
6 changes: 1 addition & 5 deletions fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,11 +532,7 @@ protected List<ColumnBase> buildColumns() {
column = new DoubleColumn(cd.getName(), cd.isNullable());
break;
case TIMESTAMP:
if (cd.getPrecision() == null) {
column = new TimestampColumn(cd.getName(), cd.isNullable());
} else {
column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
}
column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
break;
case VARCHAR:
if (cd.getSize() > Integer.MAX_VALUE) {
Expand Down
2 changes: 1 addition & 1 deletion fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/TimestampColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public TimestampColumn(String name, boolean nullable) {
this.precision = null;
}

public TimestampColumn(String name, boolean nullable, int precision) {
public TimestampColumn(String name, boolean nullable, Integer precision) {
super(name, nullable);
this.precision = precision;
}
Expand Down