Changes after review

Snowflake-Labs · Nov 13, 2023 · 1ff5f07 · 1ff5f07
1 parent 56f66c0
commit 1ff5f07
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/pkg/sdk/file_format.go b/pkg/sdk/file_format.go
@@ -329,9 +329,8 @@ type CreateFileFormatOptions struct {
 	IfNotExists *bool                  `ddl:"keyword" sql:"IF NOT EXISTS"`
 	name        SchemaObjectIdentifier `ddl:"identifier"`
 	Type        FileFormatType         `ddl:"parameter" sql:"TYPE"`
-	Comment     *string                `ddl:"parameter,single_quotes" sql:"SET COMMENT"`
-
 	FileFormatTypeOptions
+	Comment *string `ddl:"parameter,single_quotes" sql:"COMMENT"`
 }
 
 func (opts *CreateFileFormatOptions) validate() error {

diff --git a/pkg/sdk/poc/generator/keyword_builders.go b/pkg/sdk/poc/generator/keyword_builders.go
@@ -70,7 +70,7 @@ func (v *QueryStruct) NamedListWithParens(sqlPrefix string, listItemKind string,
 	return v
 }
 
-func (v *QueryStruct) WithTags() *QueryStruct {
+func (v *QueryStruct) OptionalTags() *QueryStruct {
 	return v.NamedListWithParens("TAG", "TagAssociation", nil)
 }
 

diff --git a/pkg/sdk/stages_gen_test.go b/pkg/sdk/stages_gen_test.go
@@ -106,15 +106,15 @@ func TestStages_CreateOnS3(t *testing.T) {
 		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams", "StorageIntegration", "Credentials"))
 	})
 
-	t.Run("validation: conflicting fields for [opts.ExternalStageParams.Credentials.AwsKeyId opts.ExternalStageParams.Credentials.AwsRole]", func(t *testing.T) {
+	t.Run("validation: conflicting fields for [opts.ExternalStageParams.Credentials.AWSKeyId opts.ExternalStageParams.Credentials.AWSRole]", func(t *testing.T) {
 		opts := defaultOpts()
 		opts.ExternalStageParams = &ExternalS3StageParams{
 			Credentials: &ExternalStageS3Credentials{
 				AWSKeyId: String("aws-key-id"),
 				AWSRole:  String("aws-role"),
 			},
 		}
-		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams.Credentials", "AwsKeyId", "AwsRole"))
+		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams.Credentials", "AWSKeyId", "AWSRole"))
 	})
 
 	t.Run("all options - storage integration", func(t *testing.T) {
@@ -477,15 +477,15 @@ func TestStages_AlterExternalS3Stage(t *testing.T) {
 		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams", "StorageIntegration", "Credentials"))
 	})
 
-	t.Run("validation: conflicting fields for [opts.ExternalStageParams.Credentials.AwsKeyId opts.ExternalStageParams.Credentials.AwsRole]", func(t *testing.T) {
+	t.Run("validation: conflicting fields for [opts.ExternalStageParams.Credentials.AWSKeyId opts.ExternalStageParams.Credentials.AWSRole]", func(t *testing.T) {
 		opts := defaultOpts()
 		opts.ExternalStageParams = &ExternalS3StageParams{
 			Credentials: &ExternalStageS3Credentials{
 				AWSKeyId: String("aws-key-id"),
 				AWSRole:  String("aws-role"),
 			},
 		}
-		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams.Credentials", "AwsKeyId", "AwsRole"))
+		assertOptsInvalidJoinedErrors(t, opts, errOneOf(".ExternalStageParams.Credentials", "AWSKeyId", "AWSRole"))
 	})
 
 	t.Run("all options", func(t *testing.T) {

diff --git a/pkg/sdk/views_def.go b/pkg/sdk/views_def.go
@@ -68,7 +68,7 @@ var viewColumnMaskingPolicy = g.NewQueryStruct("ViewColumnMaskingPolicy").
 	Text("Name", g.KeywordOptions().Required()).
 	Identifier("MaskingPolicy", g.KindOfT[SchemaObjectIdentifier](), g.IdentifierOptions().SQL("MASKING POLICY").Required()).
 	NamedListWithParens("USING", g.KindOfT[string](), nil). // TODO: double quotes here?
-	WithTags()
+	OptionalTags()
 
 var viewRowAccessPolicy = g.NewQueryStruct("ViewRowAccessPolicy").
 	Identifier("RowAccessPolicy", g.KindOfT[SchemaObjectIdentifier](), g.IdentifierOptions().SQL("ROW ACCESS POLICY").Required()).
@@ -147,7 +147,7 @@ var ViewsDef = g.NewInterface(
 			// In the current docs ROW ACCESS POLICY and TAG are specified twice.
 			// It is a mistake probably so here they are present only once.
 			OptionalQueryStructField("RowAccessPolicy", viewRowAccessPolicy, g.KeywordOptions()).
-			WithTags().
+			OptionalTags().
 			SQL("AS").
 			Text("sql", g.KeywordOptions().NoQuotes().Required()).
 			WithValidation(g.ValidIdentifier, "name").