Skip to content

Bug fix: "Create Table" script generation dropped "with time zone" from TIMESTAMP/TIME column #98

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

Bug fix: "Create Table" script generation dropped "with time zone" from TIMESTAMP/TIME column #98

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
42 changes: 41 additions & 1 deletion sql12/core/src/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
import org.antlr.stringtemplate.StringTemplate;
import org.apache.commons.lang3.StringUtils;

/**
* A base class for dialects where the most frequently implemented behavior can located, to avoid code
Expand Down Expand Up @@ -582,7 +583,46 @@ public String getTypeName(TableColumnInfo tcInfo)
dataType = getJavaTypeForNativeType(tcInfo.getTypeName());
}

return getTypeName(dataType, columnSize, precision, tcInfo.getDecimalDigits(), tcInfo.getTypeName());
String typeName = getTypeName(dataType, columnSize, precision, tcInfo.getDecimalDigits(), tcInfo.getTypeName());
return appendTimeZoneQualifierIfNeeded(dataType, tcInfo.getTypeName(), typeName);
}

/**
* java.sql.Types.TIMESTAMP/TIME don't distinguish the plain and "with time zone" variants, so a
* dialect's registered type name (e.g. "timestamp") silently drops the qualifier even though the
* driver's real TYPE_NAME (e.g. Postgres "timestamptz") indicates it. Restore the qualifier here,
* once, for every dialect, instead of duplicating this check in each *DialectExt subclass.
*/
private String appendTimeZoneQualifierIfNeeded(int dataType, String driverTypeNameOrNull, String resolvedTypeName)
{
if (driverTypeNameOrNull == null || resolvedTypeName == null)
{
return resolvedTypeName;
}

boolean isTimestampFamily = dataType == Types.TIMESTAMP || dataType == Types.TIMESTAMP_WITH_TIMEZONE;
boolean isTimeFamily = dataType == Types.TIME || dataType == Types.TIME_WITH_TIMEZONE;
if (!isTimestampFamily && !isTimeFamily)
{
return resolvedTypeName;
}

if (StringUtils.containsIgnoreCase(resolvedTypeName, "with time zone"))
{
// Some dialects (e.g. Oracle's raw TYPE_NAME fallback) already include the qualifier.
return resolvedTypeName;
}

boolean driverIndicatesTimeZone = StringUtils.equalsIgnoreCase(driverTypeNameOrNull, "timestamptz")
|| StringUtils.equalsIgnoreCase(driverTypeNameOrNull, "timetz")
|| StringUtils.containsIgnoreCase(driverTypeNameOrNull, "with time zone");

if (driverIndicatesTimeZone)
{
return resolvedTypeName + " with time zone";
}

return resolvedTypeName;
}

/**
Expand Down