Adds fix for string handling with whitespaces (#758)

* add fix

* add fix plus

* fmt

* removes trim

Author: madhav-db

src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSet.java

@@ -1806,9 +1806,6 @@ private <T> T getConvertedObject(
     if (obj == null) {
       return defaultValue.get();
     }
-    if (obj instanceof String) {
-      obj = removeExtraQuotes((String) obj);
-    }
     int columnType = resultSetMetaData.getColumnType(columnIndex);
     ObjectConverter converter = ConverterHelper.getConverterForSqlType(columnType);
     return convertMethod.apply(converter, obj);
@@ -1827,14 +1824,6 @@ private BigDecimal applyScaleToBigDecimal(BigDecimal bigDecimal, int columnIndex
     return bigDecimal.setScale(scale, RoundingMode.HALF_UP);
   }
 
-  private String removeExtraQuotes(String str) {
-    str = str.trim();
-    if (str.startsWith("\"") && str.endsWith("\"") && str.length() > 1) {
-      str = str.substring(1, str.length() - 1).trim();
-    }
-    return str;
-  }
-
   @Override
   public String toString() {
     return (new ToStringer(DatabricksResultSet.class))

src/main/java/com/databricks/jdbc/api/impl/converters/StringConverter.java

@@ -1,11 +1,15 @@
 package com.databricks.jdbc.api.impl.converters;
 
+import com.databricks.jdbc.exception.DatabricksParsingException;
 import com.databricks.jdbc.exception.DatabricksSQLException;
 import com.databricks.jdbc.exception.DatabricksValidationException;
+import com.databricks.jdbc.model.telemetry.enums.DatabricksDriverErrorCode;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
 public class StringConverter implements ObjectConverter {
   @Override
@@ -110,11 +114,38 @@ public char toChar(Object object) throws DatabricksSQLException {
 
   @Override
   public Date toDate(Object object) throws DatabricksSQLException {
-    return Date.valueOf(toString(object));
+    return Date.valueOf(removeExtraQuotes(toString(object)));
   }
 
   @Override
   public Timestamp toTimestamp(Object object) throws DatabricksSQLException {
-    return Timestamp.valueOf(toString(object));
+    String timestampStr = removeExtraQuotes(toString(object));
+
+    try {
+      SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSXXX");
+      java.util.Date parsedDate = dateFormat.parse(timestampStr);
+      return new Timestamp(parsedDate.getTime());
+    } catch (ParseException e) {
+      try {
+        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssXXX");
+        java.util.Date parsedDate = simpleFormat.parse(timestampStr);
+        return new Timestamp(parsedDate.getTime());
+      } catch (ParseException e2) {
+        try {
+          return Timestamp.valueOf(timestampStr);
+        } catch (IllegalArgumentException ex) {
+          throw new DatabricksParsingException(
+              "Invalid timestamp format: " + timestampStr,
+              DatabricksDriverErrorCode.JSON_PARSING_ERROR);
+        }
+      }
+    }
+  }
+
+  private String removeExtraQuotes(String str) {
+    if (str.startsWith("\"") && str.endsWith("\"") && str.length() > 1) {
+      str = str.substring(1, str.length() - 1);
+    }
+    return str;
   }
 }

src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetTest.java

@@ -144,6 +144,36 @@ void testGetStringAndWasNull() throws SQLException {
     assertEquals("test", resultSet.getString("columnLabel"));
   }
 
+  @Test
+  void testGetStringWithWhiteSpaces() throws SQLException {
+    when(mockedExecutionResult.getObject(0)).thenReturn(null);
+    DatabricksResultSet resultSet = getResultSet(StatementState.PENDING, null);
+    assertNull(resultSet.getString(1));
+    assertTrue(resultSet.wasNull());
+    when(mockedExecutionResult.getObject(0)).thenReturn("     test     ");
+    when(mockedResultSetMetadata.getColumnType(1)).thenReturn(Types.VARCHAR);
+    assertEquals("     test     ", resultSet.getString(1));
+    assertFalse(resultSet.wasNull());
+    // Test with column label
+    when(mockedResultSetMetadata.getColumnNameIndex("columnLabel")).thenReturn(1);
+    assertEquals("     test     ", resultSet.getString("columnLabel"));
+  }
+
+  @Test
+  void testGetStringWithQuotes() throws SQLException {
+    when(mockedExecutionResult.getObject(0)).thenReturn(null);
+    DatabricksResultSet resultSet = getResultSet(StatementState.PENDING, null);
+    assertNull(resultSet.getString(1));
+    assertTrue(resultSet.wasNull());
+    when(mockedExecutionResult.getObject(0)).thenReturn("\"test\"");
+    when(mockedResultSetMetadata.getColumnType(1)).thenReturn(Types.VARCHAR);
+    assertEquals("\"test\"", resultSet.getString(1));
+    assertFalse(resultSet.wasNull());
+    // Test with column label
+    when(mockedResultSetMetadata.getColumnNameIndex("columnLabel")).thenReturn(1);
+    assertEquals("\"test\"", resultSet.getString("columnLabel"));
+  }
+
   @Test
   void testGetBoolean() throws SQLException {
     DatabricksResultSet resultSet = getResultSet(StatementState.SUCCEEDED, null);

src/test/java/com/databricks/jdbc/api/impl/converters/StringConverterTest.java

@@ -7,6 +7,8 @@
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import org.junit.jupiter.api.Test;
 
 public class StringConverterTest {
@@ -15,8 +17,14 @@ public class StringConverterTest {
   private final String NUMBERICAL_ZERO_STRING = "0";
   private final String CHARACTER_STRING = "ABC";
   private final String TIME_STAMP_STRING = "2023-09-10 00:00:00";
+
+  private final String ALT_TIMESTAMP_STRING = "2025-03-18 12:08:31.552223-07:00";
+  private final String ALT_TIMESTAMP_STRING_WITH_EXTRA_QUOTES =
+      "\"2025-03-18 12:08:31.552223-07:00\"";
   private final String DATE_STRING = "2023-09-10";
 
+  private final String DATE_STRING_WITH_EXTRA_QUOTES = "\"2023-09-10\"";
+
   @Test
   public void testConvertToByte() throws DatabricksSQLException {
     String singleCharacterString = "A";
@@ -155,14 +163,22 @@ public void testConvertToString() throws DatabricksSQLException {
   }
 
   @Test
-  public void testConvertToTimestamp() throws DatabricksSQLException {
+  public void testConvertToTimestamp() throws DatabricksSQLException, ParseException {
     assertEquals(
         new StringConverter().toTimestamp(TIME_STAMP_STRING), Timestamp.valueOf(TIME_STAMP_STRING));
+    assertEquals(
+        new StringConverter().toTimestamp(ALT_TIMESTAMP_STRING_WITH_EXTRA_QUOTES),
+        new Timestamp(
+            new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSXXX")
+                .parse(ALT_TIMESTAMP_STRING)
+                .getTime()));
   }
 
   @Test
   public void testConvertToDate() throws DatabricksSQLException {
     assertEquals(new StringConverter().toDate(DATE_STRING), Date.valueOf(DATE_STRING));
+    assertEquals(
+        new StringConverter().toDate(DATE_STRING_WITH_EXTRA_QUOTES), Date.valueOf(DATE_STRING));
   }
 
   @Test