Skip to content

fix(metadata): map PostgreSQL money to decimal #4559

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
hutiefang76 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(metadata): map PostgreSQL money to decimal #4559

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: 3 additions & 3 deletions ...y-metadata-postgresql/src/main/java/org/dinky/metadata/convert/PostgreSqlTypeConvert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public ColumnType convert(Column column) {
boolean isNullable = !column.isKeyFlag() && column.isNullable();
final LogicalTypeParam logicalTypeParam =
LogicalTypeParam.of(isNullable, length, column.getPrecision(), column.getScale());
if (type.contains("numeric") || type.contains("decimal")) {
int intValue = column.getPrecision().intValue();
if (intValue > 38) {
if (type.contains("numeric") || type.contains("decimal") || type.contains("money")) {
Integer precision = column.getPrecision();
if (Asserts.isNotNull(precision) && precision > 38) {
return ColumnType.of(DataTypes.STRING, DataTypes.STRING.copyLogicalType(logicalTypeParam));
}
return ColumnType.of(DataTypes.DECIMAL, DataTypes.DECIMAL.copyLogicalType(logicalTypeParam));
Expand Down
17 changes: 17 additions & 0 deletions ...nky-metadata-postgresql/src/test/java/org/dinky/metadata/driver/PostgreSqlDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@

import org.dinky.data.model.Column;
import org.dinky.data.model.Table;
import org.dinky.data.types.ColumnType;
import org.dinky.data.types.DataTypes;
import org.dinky.metadata.convert.PostgreSqlTypeConvert;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -145,4 +147,19 @@ void getCreateTableSql() {
+ "COMMENT ON COLUMN \"public\".\"user\".\"register_time\" IS '注册时间';\n";
assertEquals(expect, tableDDL);
}

@Test
void convertMoneyTypeToDecimal() {
Column moneyColumn = Column.builder()
.name("balance")
.type("money")
.precision(19)
.scale(2)
.isNullable(true)
.build();

ColumnType columnType = new PostgreSqlTypeConvert().convert(moneyColumn);

assertEquals(DataTypes.DECIMAL, columnType.getValue());
}
}
Loading