Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] type issue in databricks_sql_table #4422

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[Fix] type issue in databricks_sql_table #4422

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bfbdaf
[Fix] Fix type issue in databricks_sql_table with columns that have m…
ian-norris-ncino Jan 21, 2025
3dee149
updating function to use regex and adding tests
ian-norris-ncino Jan 23, 2025
bad19da
further string handling and updated tests
ian-norris-ncino Jan 23, 2025
e5f6ede
formatting
ian-norris-ncino Jan 23, 2025
005e606
added column defauls feature support into integration tests
ian-norris-ncino Jan 24, 2025
d5a32ad
syntax fix
ian-norris-ncino Jan 28, 2025
0ee9ac0
Merge branch 'main' into issue-4421
alexott Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions catalog/resource_sql_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"log"
"reflect"
"regexp"
"slices"
"strings"
"time"
Expand Down Expand Up @@ -540,10 +541,14 @@ var columnTypeAliases = map[string]string{

func getColumnType(columnType string) string {
caseInsensitiveColumnType := strings.ToLower(columnType)
if alias, ok := columnTypeAliases[caseInsensitiveColumnType]; ok {
pattern := regexp.MustCompile(`^\w+(\s*\(.*?\))?`)
patternMatched := pattern.FindString(caseInsensitiveColumnType)
normalizedColumnType := strings.ReplaceAll(patternMatched, " ", "")

if alias, ok := columnTypeAliases[normalizedColumnType]; ok {
return alias
}
return caseInsensitiveColumnType
return normalizedColumnType
Comment on lines -546 to +551
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this change, need to think how changes like decimal(12, 2) -> decimal(12,2) will affect the plan/apply and then read operations

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let me know what you think the best approach is and I'm happy to implement.

}

func assertNoColumnTypeDiff(oldCols []interface{}, newColumnInfos []SqlColumnInfo) error {
Expand Down
61 changes: 61 additions & 0 deletions catalog/resource_sql_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,67 @@ func TestResourceSqlTableUpdateTable_ColumnsTypeUpperLowerCaseThrowsError(t *tes
)
}

func TestResourceSqlTableUpdateTable_ColumnsTypeMultipleWordsThrowsError(t *testing.T) {
resourceSqlTableUpdateColumnHelper(t,
resourceSqlTableUpdateColumnTestMetaData{
oldColumns: []SqlColumnInfo{
{
Name: "one",
Type: "timestamp",
Comment: "old comment",
Nullable: false,
},
{
Name: "two",
Type: "decimal(12,2)",
Comment: "old comment",
Nullable: false,
},
},
newColumns: []SqlColumnInfo{
{
Name: "one",
Type: "TIMESTAMP DEFAULT current_timestamp()",
Comment: "old comment",
Nullable: true,
},
{
Name: "two",
Type: "DECIMAL(12, 2)",
Comment: "old comment",
Nullable: true,
},
},
allowedCommands: []string{
"ALTER TABLE `main`.`foo`.`bar` ALTER COLUMN `one` DROP NOT NULL",
"ALTER TABLE `main`.`foo`.`bar` ALTER COLUMN `two` DROP NOT NULL",
},
expectedErrorMsg: "",
},
)
}
func TestResourceSqlTableUpdateTable_ColumnsTypeStringHandling(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"TIMESTAMP DEFAULT current_timestamp()", "timestamp"},
{"timestamp", "timestamp"},
{"string", "string"},
{"int", "int"},
{"decimal", "decimal(10,0)"},
{"decimal(12, 0)", "decimal(12,0)"},
}
for _, test := range tests {
t.Run(test.input, func(t *testing.T) {
result := getColumnType(test.input)
if result != test.expected {
t.Errorf("getColumnType(%q) = %q; want %q", test.input, result, test.expected)
}
})
}
}

func TestResourceSqlTableUpdateTable_ColumnsAdditionAndUpdateThrowsError(t *testing.T) {
resourceSqlTableUpdateColumnHelper(t,
resourceSqlTableUpdateColumnTestMetaData{
Expand Down
14 changes: 14 additions & 0 deletions internal/acceptance/sql_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ func constructManagedSqlTableTemplate(tableName string, columnInfos []catalog.Sq
properties = {
"this" = "that"
"something" = "else"
"delta.feature.allowColumnDefaults" = "supported"
"delta.feature.columnMapping" = "supported"
"delta.feature.invariants" = "supported"
"delta.minReaderVersion" = 3
Expand Down Expand Up @@ -496,6 +497,19 @@ func TestUcAccResourceSqlTable_ChangeColumnTypeThrows(t *testing.T) {
})
}

func TestUcAccResourceSqlTable_ChangeColumnTypeWithMultipleWords(t *testing.T) {
if os.Getenv("GOOGLE_CREDENTIALS") != "" {
Skipf(t)("databricks_sql_table resource not available on GCP")
}
tableName := RandomName()

UnityWorkspaceLevel(t, Step{
Template: constructManagedSqlTableTemplate(tableName, []catalog.SqlColumnInfo{{Name: "name", Type: "TIMESTAMP DEFAULT current_timestamp()", Nullable: true, Comment: "comment"}}),
}, Step{
Template: constructManagedSqlTableTemplate(tableName, []catalog.SqlColumnInfo{{Name: "name", Type: "timestamp", Nullable: true, Comment: "comment"}}),
})
}

func TestUcAccResourceSqlTable_DropColumn(t *testing.T) {
if os.Getenv("GOOGLE_CREDENTIALS") != "" {
Skipf(t)("databricks_sql_table resource not available on GCP")
Expand Down
Loading