Fix merge conflicts

Snowflake-Labs · Dec 8, 2023 · 98eab8e · 98eab8e
1 parent e2d304e
commit 98eab8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/pkg/sdk/event_tables_dto_builders_gen.go b/pkg/sdk/event_tables_dto_builders_gen.go
diff --git a/pkg/sdk/event_tables_dto_gen.go b/pkg/sdk/event_tables_dto_gen.go
@@ -21,7 +21,7 @@ type CreateEventTableRequest struct {
 	DefaultDdlCollation        *string
 	CopyGrants                 *bool
 	Comment                    *string
-	RowAccessPolicy            *RowAccessPolicy
+	RowAccessPolicy            *TableRowAccessPolicy
 	Tag                        []TagAssociation
 }
 

diff --git a/pkg/sdk/event_tables_gen.go b/pkg/sdk/event_tables_gen.go
@@ -29,7 +29,7 @@ type CreateEventTableOptions struct {
 	DefaultDdlCollation        *string                `ddl:"parameter,single_quotes" sql:"DEFAULT_DDL_COLLATION"`
 	CopyGrants                 *bool                  `ddl:"keyword" sql:"COPY GRANTS"`
 	Comment                    *string                `ddl:"parameter,single_quotes" sql:"COMMENT"`
-	RowAccessPolicy            *RowAccessPolicy       `ddl:"keyword"`
+	RowAccessPolicy            *TableRowAccessPolicy  `ddl:"keyword"`
 	Tag                        []TagAssociation       `ddl:"keyword,parentheses" sql:"TAG"`
 }
 

diff --git a/pkg/sdk/event_tables_gen_test.go b/pkg/sdk/event_tables_gen_test.go
@@ -37,7 +37,7 @@ func TestEventTables_Create(t *testing.T) {
 		opts.CopyGrants = Bool(true)
 		opts.Comment = String("test")
 		pn := NewSchemaObjectIdentifier(random.StringN(4), random.StringN(4), random.StringN(4))
-		opts.RowAccessPolicy = &RowAccessPolicy{
+		opts.RowAccessPolicy = &TableRowAccessPolicy{
 			Name: pn,
 			On:   []string{"c1", "c2"},
 		}