Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 14 additions & 15 deletions api/src/org/labkey/api/exp/PropertyColumn.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ public void setParentIsObjectId(boolean id)
@Override
public SQLFragment getValueSql(String tableAlias)
{
String cast = getPropertySqlCastType();
SQLFragment sql = new SQLFragment("(SELECT ");
if (isMvIndicatorColumn())
{
Expand All @@ -232,6 +231,8 @@ else if (_pd.getPropertyType() == PropertyType.BOOLEAN)
else
sql.append(getTableAlias(tableAlias)).append(".ObjectId");
sql.append(")");

String cast = getPropertySqlCastType();
if (null != cast)
{
sql.insert(0, "CAST(");
Expand Down Expand Up @@ -262,23 +263,21 @@ static private String getPropertyCol(@NotNull PropertyDescriptor pd)
};
}

private String getPropertySqlCastType()
private @Nullable String getPropertySqlCastType()
{
if (isMvIndicatorColumn())
return null;
PropertyType pt = _pd.getPropertyType();
if (PropertyType.DOUBLE == pt || PropertyType.DATE_TIME == pt)
return null;
else if (PropertyType.TIME == pt)
return "TIME";
else if (PropertyType.DATE == pt)
return "DATE";
else if (PropertyType.INTEGER == pt)
return "INT";
else if (PropertyType.BOOLEAN == pt)
return getParentTable().getSqlDialect().getBooleanDataType();
else
return getParentTable().getSqlDialect().getSqlTypeName(JdbcType.VARCHAR) + "(" + PropertyStorageSpec.DEFAULT_SIZE + ")";

return switch (_pd.getPropertyType())
{
case DOUBLE, DATE_TIME, DECIMAL, FLOAT -> null;
case TIME -> "TIME";
case DATE -> "DATE";
case INTEGER -> "INT";
case BOOLEAN -> getParentTable().getSqlDialect().getBooleanDataType();
case null, default -> getParentTable().getSqlDialect().getSqlTypeName(JdbcType.VARCHAR) +
"(" + PropertyStorageSpec.DEFAULT_SIZE + ")";
};
}

public PropertyDescriptor getPropertyDescriptor()
Expand Down
Loading