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

feat: add the param "pattern" for snowflake_external_table #657

Merged
merged 4 commits into from
Aug 24, 2021
+12 −4
Merged

feat: add the param "pattern" for snowflake_external_table #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3426a76
add the param "pattern" for snowflake_external_table
hkak03key Aug 21, 2021
b524f39
Merge branch 'main' into upsteram/issues/656
alldoami Aug 23, 2021
4bec8e2
fix format
hkak03key Aug 24, 2021
7962e4e
update doc
hkak03key Aug 24, 2021
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
1 change: 1 addition & 0 deletions docs/resources/external_table.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ resource snowflake_external_table external_table {
- **copy_grants** (Boolean) Specifies to retain the access permissions from the original table when an external table is recreated using the CREATE OR REPLACE TABLE variant
- **id** (String) The ID of this resource.
- **partition_by** (List of String) Specifies any partition columns to evaluate for the external table.
- **pattern** (String) Specifies the file names and/or paths on the external stage to match.
- **refresh_on_create** (Boolean) Specifies weather to refresh when an external table is created.

### Read-Only
Expand Down
7 changes: 6 additions & 1 deletion pkg/resources/external_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,12 @@ var externalTableSchema = map[string]*schema.Schema{
ForceNew: true,
Description: "Specifies the file format for the external table.",
},

"pattern": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Description: "Specifies the file names and/or paths on the external stage to match.",
},
"aws_sns_topic": {
Type: schema.TypeString,
Optional: true,
Expand Down
3 changes: 2 additions & 1 deletion pkg/resources/external_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ func TestExternalTableCreate(t *testing.T) {
"column": []interface{}{map[string]interface{}{"name": "column1", "type": "OBJECT", "as": "a"}, map[string]interface{}{"name": "column2", "type": "VARCHAR", "as": "b"}},
"location": "location",
"file_format": "format",
"pattern": "pattern",
}
d := externalTable(t, "database_name|schema_name|good_name", in)

WithMockDb(t, func(db *sql.DB, mock sqlmock.Sqlmock) {
mock.ExpectExec(`CREATE EXTERNAL TABLE "database_name"."schema_name"."good_name" \("column1" OBJECT AS a, "column2" VARCHAR AS b\) WITH LOCATION = location REFRESH_ON_CREATE = true AUTO_REFRESH = true FILE_FORMAT = \( format \) COMMENT = 'great comment'`).WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectExec(`CREATE EXTERNAL TABLE "database_name"."schema_name"."good_name" \("column1" OBJECT AS a, "column2" VARCHAR AS b\) WITH LOCATION = location REFRESH_ON_CREATE = true AUTO_REFRESH = true PATTERN = 'pattern' FILE_FORMAT = \( format \) COMMENT = 'great comment'`).WillReturnResult(sqlmock.NewResult(1, 1))

expectExternalTableRead(mock)
err := resources.CreateExternalTable(d, db)
Expand Down
5 changes: 3 additions & 2 deletions pkg/snowflake/external_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ func TestExternalTableCreate(t *testing.T) {
s := ExternalTable("test_table", "test_db", "test_schema")
s.WithColumns([]map[string]string{{"name": "column1", "type": "OBJECT", "as": "expression1"}, {"name": "column2", "type": "VARCHAR", "as": "expression2"}})
s.WithLocation("location")
s.WithPattern("pattern")
s.WithFileFormat("file format")
r.Equal(s.QualifiedName(), `"test_db"."test_schema"."test_table"`)

r.Equal(s.Create(), `CREATE EXTERNAL TABLE "test_db"."test_schema"."test_table" ("column1" OBJECT AS expression1, "column2" VARCHAR AS expression2) WITH LOCATION = location REFRESH_ON_CREATE = false AUTO_REFRESH = false FILE_FORMAT = ( file format )`)
r.Equal(s.Create(), `CREATE EXTERNAL TABLE "test_db"."test_schema"."test_table" ("column1" OBJECT AS expression1, "column2" VARCHAR AS expression2) WITH LOCATION = location REFRESH_ON_CREATE = false AUTO_REFRESH = false PATTERN = 'pattern' FILE_FORMAT = ( file format )`)

s.WithComment("Test Comment")
r.Equal(s.Create(), `CREATE EXTERNAL TABLE "test_db"."test_schema"."test_table" ("column1" OBJECT AS expression1, "column2" VARCHAR AS expression2) WITH LOCATION = location REFRESH_ON_CREATE = false AUTO_REFRESH = false FILE_FORMAT = ( file format ) COMMENT = 'Test Comment'`)
r.Equal(s.Create(), `CREATE EXTERNAL TABLE "test_db"."test_schema"."test_table" ("column1" OBJECT AS expression1, "column2" VARCHAR AS expression2) WITH LOCATION = location REFRESH_ON_CREATE = false AUTO_REFRESH = false PATTERN = 'pattern' FILE_FORMAT = ( file format ) COMMENT = 'Test Comment'`)
}

func TestExternalTableDrop(t *testing.T) {
Expand Down