Various bug fixes

src/main/java/org/polypheny/jdbc/PolyphenyPreparedStatement.java

@@ -35,6 +35,7 @@
 import java.sql.SQLXML;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.LinkedList;
@@ -440,6 +441,9 @@ public int[] executeBatch() throws SQLException {
     private List<Long> executeParameterizedBatch() throws SQLException {
         throwIfClosed();
         try {
+            if ( parameterBatch.isEmpty() ) {
+                return new ArrayList<>();
+            }
             StatementBatchResponse status = getClient().executeIndexedStatementBatch( statementId, parameterBatch, getTimeout() );
             return status.getScalarsList();
         } finally {

src/main/java/org/polypheny/jdbc/meta/PolyphenyResultSetMetadata.java

@@ -26,13 +26,13 @@
 
 public class PolyphenyResultSetMetadata implements ResultSetMetaData {
 
-    private List<PolyphenyColumnMeta> columnMetas;
-    private Map<String, Integer> columnIndexes;
+    private final List<PolyphenyColumnMeta> columnMetas;
+    private final Map<String, Integer> columnIndexes;
 
 
     public PolyphenyResultSetMetadata( List<PolyphenyColumnMeta> columnMetas ) {
         this.columnMetas = columnMetas;
-        this.columnIndexes = this.columnMetas.stream().collect( Collectors.toMap( PolyphenyColumnMeta::getColumnLabel, c -> c.getOrdinal() + 1, ( m, n ) -> n ) );
+        this.columnIndexes = this.columnMetas.stream().collect( Collectors.toMap( c -> c.getColumnName().toLowerCase(), c -> c.getOrdinal() + 1, ( m, n ) -> n ) );
 
     }
 
@@ -47,7 +47,7 @@ private PolyphenyColumnMeta getMeta( int columnIndex ) throws SQLException {
 
 
     public int getColumnIndexFromLabel( String columnLabel ) throws SQLException {
-        Integer columnIndex = columnIndexes.get( columnLabel );
+        Integer columnIndex = columnIndexes.get( columnLabel.toLowerCase() );
         if ( columnIndex == null ) {
             throw new PrismInterfaceServiceException( PrismInterfaceErrors.COLUMN_NOT_EXISTS, "Invalid column label: " + columnLabel );
         }

src/main/java/org/polypheny/jdbc/types/TypedValue.java

@@ -665,7 +665,7 @@ public int asInt() throws SQLException {
         if ( isNull() ) {
             return 0;
         }
-        throw new PrismInterfaceServiceException( PrismInterfaceErrors.DATA_TYPE_MISMATCH, "This value is not of type TINYINT, SMALLINT, INTEGER or BIGINT." );
+        throw new PrismInterfaceServiceException( PrismInterfaceErrors.DATA_TYPE_MISMATCH, "This value is not of type TINYINT, SMALLINT, INTEGER, BIGINT or DECIMAL." );
     }
 
 
@@ -680,10 +680,13 @@ public long asLong() throws SQLException {
         if ( integerValue != null ) {
             return integerValue;
         }
+        if ( bigDecimalValue != null ) {
+            return bigDecimalValue.longValue();
+        }
         if ( isNull() ) {
             return 0;
         }
-        throw new PrismInterfaceServiceException( PrismInterfaceErrors.DATA_TYPE_MISMATCH, "This value is not of type TINYINT, SMALLINT, INTEGER or BIGINT." );
+        throw new PrismInterfaceServiceException( PrismInterfaceErrors.DATA_TYPE_MISMATCH, "This value is not of type TINYINT, SMALLINT, INTEGER, BIGINT or DECIMAL." );
     }
 
 
@@ -1049,6 +1052,9 @@ public Timestamp asTimestamp() throws SQLException {
 
     @Override
     public Timestamp asTimestamp( Calendar calendar ) throws SQLException {
+        if ( isNull() ) {
+            return null;
+        }
         return TypedValueUtils.getTimestampInCalendar( asTimestamp(), calendar );
     }
 

src/main/java/org/polypheny/jdbc/utils/TypedValueUtils.java

@@ -158,6 +158,9 @@ public static Timestamp getTimestampInCalendar( Timestamp timestamp, Calendar ca
 
 
     private static long getTimeLongInCalendar( long value, Calendar calendar ) {
+        if ( calendar == null ) {
+            return value - Calendar.getInstance().getTimeZone().getOffset( value );
+        }
         return value - calendar.getTimeZone().getOffset( value );
     }
 

src/test/java/org/polypheny/jdbc/types/TypedValueTest.java

@@ -317,12 +317,6 @@ public void fromAsciiStreamWithValidStream() throws SQLException {
     }
 
 
-    @Test()
-    public void fromTimeWithNullCalendarThrowsException() {
-        assertThrows( NullPointerException.class, () -> TypedValue.fromTime( new Time( 10, 30, 0 ), null ) );
-    }
-
-
     @Test
     public void timeZoneTest() {
         Time input = new Time( 123456 );
@@ -415,12 +409,6 @@ public void asTimeWithValidValue() throws SQLException {
     }
 
 
-    @Test()
-    public void fromDateWhenNullCalendarProvidedThenThrowException() {
-        assertThrows( NullPointerException.class, () -> TypedValue.fromDate( new Date( 2022, 1, 1 ), null ) );
-    }
-
-
     @Test
     public void fromDateWhenValidDateAndCalendarProvided() throws SQLException {
         Date date = new Date( 2021, Calendar.JANUARY, 1 );