From ad1c5d137a3329fd5031942a0a6125bd8ca1faba Mon Sep 17 00:00:00 2001 From: Thomas Reinhardt Date: Fri, 24 Jan 2025 09:35:59 +0100 Subject: [PATCH 1/2] Changed targetVM to 17 --- sql12/build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql12/build.xml b/sql12/build.xml index 535d18014..fef17d29b 100644 --- a/sql12/build.xml +++ b/sql12/build.xml @@ -1,7 +1,7 @@ - + @@ -110,7 +110,7 @@ - - + From 319aa4f8f02a7231e9b61f5640fd47bc837e0ad3 Mon Sep 17 00:00:00 2001 From: Thomas Reinhardt Date: Fri, 24 Jan 2025 09:44:06 +0100 Subject: [PATCH 2/2] Support for MSSQL Server datetimeoffset datatype --- .../fw/datasetviewer/cellcomponent/CellComponentFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java index f12af4548..7456127c8 100644 --- a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java +++ b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java @@ -693,7 +693,7 @@ public static OkJPanel[] getControlPanels() new ArrayList(Arrays.asList(initialClassNameList)); // add to that the list of all names that have been registered by plugins -// Iterator pluginDataTypeFactories = +// Iterator pluginDataTypeFactories = // _registeredDataTypes.values().iterator(); // while (pluginDataTypeFactories.hasNext()) { // TODO: add support for plugin-registered data-type preferences panels @@ -859,6 +859,7 @@ private static IDataTypeComponent getGenericDataType(JTable table, ColumnDisplay case Types.TIMESTAMP: case -101: // Oracle's 'TIMESTAMP WITH TIME ZONE' == -101 case -102: // Oracle's 'TIMESTAMP WITH LOCAL TIME ZONE' == -102 + case -155: // MSSQL Server's 'TIMESTAMP WITH LOCAL TIME ZONE' == -155 dataTypeComponent = new DataTypeTimestamp(table, colDef); break;