Merge branch 'master' into deprecate-create-all-cols

artie-labs · Jul 8, 2024 · 933a5c3 · 933a5c3
2 parents 29e3c0e + 4c37ef2
commit 933a5c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/clients/redshift/dialect/dialect.go b/clients/redshift/dialect/dialect.go
@@ -65,7 +65,6 @@ func (RedshiftDialect) DataTypeForKind(kd typing.KindDetails, _ bool) string {
 
 func (RedshiftDialect) KindForDataType(rawType string, stringPrecision string) (typing.KindDetails, error) {
 	rawType = strings.ToLower(rawType)
-	// TODO: Check if there are any missing Redshift data types.
 	if strings.HasPrefix(rawType, "numeric") {
 		_, parameters, err := sql.ParseDataTypeDefinition(rawType)
 		if err != nil {
@@ -75,15 +74,14 @@ func (RedshiftDialect) KindForDataType(rawType string, stringPrecision string) (
 	}
 
 	if strings.Contains(rawType, "character varying") {
-		var strPrecision *int
 		precision, err := strconv.Atoi(stringPrecision)
-		if err == nil {
-			strPrecision = &precision
+		if err != nil {
+			return typing.Invalid, fmt.Errorf("failed to parse string precision: %q, err: %w", stringPrecision, err)
 		}
 
 		return typing.KindDetails{
 			Kind:                    typing.String.Kind,
-			OptionalStringPrecision: strPrecision,
+			OptionalStringPrecision: &precision,
 		}, nil
 	}
 
@@ -104,7 +102,7 @@ func (RedshiftDialect) KindForDataType(rawType string, stringPrecision string) (
 		return typing.Boolean, nil
 	}
 
-	return typing.Invalid, nil
+	return typing.Invalid, fmt.Errorf("unsupported data type: %s", rawType)
 }
 
 func (RedshiftDialect) IsColumnAlreadyExistsErr(err error) bool {

diff --git a/clients/redshift/dialect/dialect_test.go b/clients/redshift/dialect/dialect_test.go
@@ -67,18 +67,6 @@ func TestRedshiftDialect_KindForDataType(t *testing.T) {
 			},
 			expectedKd: typing.Integer,
 		},
-		{
-			name: "String w/o precision",
-			rawTypes: []rawTypeAndPrecision{
-				{rawType: "character varying"},
-				{rawType: "character varying(65535)"},
-				{
-					rawType:   "character varying",
-					precision: "not a number",
-				},
-			},
-			expectedKd: typing.String,
-		},
 		{
 			name: "String w/ precision",
 			rawTypes: []rawTypeAndPrecision{

diff --git a/lib/typing/typing.go b/lib/typing/typing.go
@@ -18,6 +18,7 @@ type KindDetails struct {
 	ExtendedDecimalDetails *decimal.Details
 
 	// Optional kind details metadata
+	// TODO: Consider changing this to an int32
 	OptionalStringPrecision *int
 }