From 98eab8e3400d04ce3489ea5f7105b66b9905786d Mon Sep 17 00:00:00 2001
From: Artur Sawicki <artur.sawicki@snowflake.com>
Date: Fri, 8 Dec 2023 10:04:44 +0100
Subject: [PATCH] Fix merge conflicts

---
 pkg/sdk/event_tables_dto_builders_gen.go | 4 +---
 pkg/sdk/event_tables_dto_gen.go          | 2 +-
 pkg/sdk/event_tables_gen.go              | 2 +-
 pkg/sdk/event_tables_gen_test.go         | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/sdk/event_tables_dto_builders_gen.go b/pkg/sdk/event_tables_dto_builders_gen.go
index 9d25168bbc..c7ab428c05 100644
--- a/pkg/sdk/event_tables_dto_builders_gen.go
+++ b/pkg/sdk/event_tables_dto_builders_gen.go
@@ -2,8 +2,6 @@
 
 package sdk
 
-import ()
-
 func NewCreateEventTableRequest(
 	name SchemaObjectIdentifier,
 ) *CreateEventTableRequest {
@@ -57,7 +55,7 @@ func (s *CreateEventTableRequest) WithComment(Comment *string) *CreateEventTable
 	return s
 }
 
-func (s *CreateEventTableRequest) WithRowAccessPolicy(RowAccessPolicy *RowAccessPolicy) *CreateEventTableRequest {
+func (s *CreateEventTableRequest) WithRowAccessPolicy(RowAccessPolicy *TableRowAccessPolicy) *CreateEventTableRequest {
 	s.RowAccessPolicy = RowAccessPolicy
 	return s
 }
diff --git a/pkg/sdk/event_tables_dto_gen.go b/pkg/sdk/event_tables_dto_gen.go
index c043c86b21..3a4b5ca7d5 100644
--- 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
index b4e641a5a9..a2f2f7ef52 100644
--- 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
index 006cb2cd98..af08c6eee2 100644
--- 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"},
 		}