fix(go/adbc/driver/snowflake): fix XDBC support when using high preci…

…sion (apache#1311) - Fixes apache#1309 - Fixes a namespace - Adds a test for Xdbc in the C# code - hanging merge fix from rebase --------- Co-authored-by: David Coe <[email protected]>
davidhcoe · Nov 21, 2023 · cac2d83 · cac2d83
1 parent 388a1c0
commit cac2d83
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/csharp/test/Drivers/Snowflake/DriverTests.cs b/csharp/test/Drivers/Snowflake/DriverTests.cs
@@ -330,8 +330,21 @@ public void CanGetObjectsAll()
                 .FirstOrDefault();
 
             Assert.True(columns != null, "Columns cannot be null");
+            Assert.Equal(testConfiguration.Metadata.ExpectedColumnCount, columns.Count);
 
-            Assert.Equal(_testConfiguration.Metadata.ExpectedColumnCount, columns.Count);
+            if (testConfiguration.UseHighPrecision)
+            {
+                IEnumerable<AdbcColumn> highPrecisionColumns = columns.Where(c => c.XdbcTypeName == "NUMBER");
+
+                if(highPrecisionColumns.Count() > 0)
+                {
+                    // ensure they all are coming back as XdbcDataType_XDBC_DECIMAL because they are Decimal128
+                    short XdbcDataType_XDBC_DECIMAL = 3;
+                    IEnumerable<AdbcColumn> invalidHighPrecisionColumns  = highPrecisionColumns.Where(c => c.XdbcSqlDataType != XdbcDataType_XDBC_DECIMAL);
+                    int count = invalidHighPrecisionColumns.Count();
+                    Assert.True(count == 0, $"There are {count} columns that do not map to the correct XdbcSqlDataType when UseHighPrecision=true");
+                }
+            }
         }
 
         /// <summary>

diff --git a/csharp/test/Drivers/Snowflake/ValueTests.cs b/csharp/test/Drivers/Snowflake/ValueTests.cs
@@ -18,12 +18,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlTypes;
-using Apache.Arrow.Adbc.Tests.Drivers.Interop.Snowflake;
 using Apache.Arrow.Ipc;
 using Apache.Arrow.Types;
 using Xunit;
 
-namespace Apache.Arrow.Adbc.Tests
+namespace Apache.Arrow.Adbc.Tests.Drivers.Interop.Snowflake
 {
     // TODO: When supported, use prepared statements instead of SQL string literals
     //      Which will better test how the driver handles values sent/received
@@ -239,13 +238,6 @@ private static string ConvertDoubleToString(double value)
                     return "'-inf'";
                 case double.NaN:
                     return "'NaN'";
-#if NET472
-                // Standard Double.ToString() calls round up the max value, resulting in Snowflake storing infinity
-                case double.MaxValue:
-                    return "1.7976931348623157E+308";
-                case double.MinValue:
-                    return "-1.7976931348623157E+308";
-#endif
                 default:
                     return value.ToString();
             }

diff --git a/go/adbc/driver/snowflake/connection.go b/go/adbc/driver/snowflake/connection.go
@@ -323,15 +323,22 @@ func (c *cnxn) getObjectsDbSchemas(ctx context.Context, depth adbc.ObjectDepth,
 
 var loc = time.Now().Location()
 
-func toField(name string, isnullable bool, dataType string, numPrec, numPrecRadix, numScale sql.NullInt16, isIdent bool, identGen, identInc sql.NullString, charMaxLength, charOctetLength sql.NullInt32, datetimePrec sql.NullInt16, comment sql.NullString, ordinalPos int) (ret arrow.Field) {
+func toField(name string, isnullable bool, dataType string, numPrec, numPrecRadix, numScale sql.NullInt16, isIdent, useHighPrecision bool, identGen, identInc sql.NullString, charMaxLength, charOctetLength sql.NullInt32, datetimePrec sql.NullInt16, comment sql.NullString, ordinalPos int) (ret arrow.Field) {
 	ret.Name, ret.Nullable = name, isnullable
 
 	switch dataType {
 	case "NUMBER":
-		if !numScale.Valid || numScale.Int16 == 0 {
-			ret.Type = arrow.PrimitiveTypes.Int64
+		if useHighPrecision {
+			ret.Type = &arrow.Decimal128Type{
+				Precision: int32(numPrec.Int16),
+				Scale:     int32(numScale.Int16),
+			}
 		} else {
-			ret.Type = arrow.PrimitiveTypes.Float64
+			if !numScale.Valid || numScale.Int16 == 0 {
+				ret.Type = arrow.PrimitiveTypes.Int64
+			} else {
+				ret.Type = arrow.PrimitiveTypes.Float64
+			}
 		}
 	case "FLOAT":
 		fallthrough
@@ -639,7 +646,7 @@ func (c *cnxn) getObjectsTables(ctx context.Context, depth adbc.ObjectDepth, cat
 			}
 
 			prevKey = key
-			fieldList = append(fieldList, toField(colName, isNullable, dataType, numericPrec, numericPrecRadix, numericScale, isIdent, identGen, identIncrement, charMaxLength, charOctetLength, datetimePrec, comment, ordinalPos))
+			fieldList = append(fieldList, toField(colName, isNullable, dataType, numericPrec, numericPrecRadix, numericScale, isIdent, c.useHighPrecision, identGen, identIncrement, charMaxLength, charOctetLength, datetimePrec, comment, ordinalPos))
 		}
 
 		if len(fieldList) > 0 && curTableInfo != nil {