From f2a4c6422908ab7b14857486924ebc0fe26d0b0d Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Sat, 29 Aug 2020 16:01:25 +0200
Subject: [PATCH] Fix reporting ret. value type, comment-out store hooks on tpl
 level

---
 pkg/codegen/assets/store_rdbms.gen.go.tpl | 58 +++++++++++++----------
 store/compose_records.gen.go              |  4 +-
 store/compose_records.yaml                |  2 +-
 store/rdbms/actionlog.gen.go              | 13 -----
 store/rdbms/applications.gen.go           | 27 -----------
 store/rdbms/attachments.gen.go            | 27 -----------
 store/rdbms/compose_attachments.gen.go    | 27 -----------
 store/rdbms/compose_charts.gen.go         | 27 -----------
 store/rdbms/compose_module_fields.gen.go  | 27 -----------
 store/rdbms/compose_modules.gen.go        | 27 -----------
 store/rdbms/compose_namespaces.gen.go     | 27 -----------
 store/rdbms/compose_pages.gen.go          | 27 -----------
 store/rdbms/compose_record_values.gen.go  | 27 -----------
 store/rdbms/compose_records.gen.go        | 27 -----------
 store/rdbms/credentials.gen.go            | 27 -----------
 store/rdbms/rbac_rules.gen.go             | 27 -----------
 store/rdbms/reminders.gen.go              | 27 -----------
 store/rdbms/role_members.gen.go           | 27 -----------
 store/rdbms/roles.gen.go                  | 27 -----------
 store/rdbms/settings.gen.go               | 27 -----------
 store/rdbms/users.gen.go                  | 27 -----------
 21 files changed, 36 insertions(+), 500 deletions(-)

diff --git a/pkg/codegen/assets/store_rdbms.gen.go.tpl b/pkg/codegen/assets/store_rdbms.gen.go.tpl
index 472eaad15..36b1f7cea 100644
--- a/pkg/codegen/assets/store_rdbms.gen.go.tpl
+++ b/pkg/codegen/assets/store_rdbms.gen.go.tpl
@@ -351,10 +351,12 @@ func (s Store) {{ toggleExport .Create.Export "Create" $.Types.Singular }}(ctx c
 			return err
 		}
 
-		// err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Create{{ template "extraArgsCall" . }}, res)
-		// if err != nil {
-		// 	return err
-		// }
+{{/*
+		err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Create{{ template "extraArgsCall" . }}, res)
+		if err != nil {
+			return err
+		}
+*/}}
 
 		err = s.execCreate{{ export $.Types.Plural }}(ctx, s.internal{{ export $.Types.Singular }}Encoder(res))
 		if err != nil {
@@ -380,11 +382,12 @@ func (s Store) {{ toggleExport .Update.Export "Partial" $.Types.Singular "Update
 			return err
 		}
 
-		// err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Update{{ template "extraArgsCall" . }}, res)
-		// if err != nil {
-		// 	return err
-		// }
-
+{{/*
+		err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Update{{ template "extraArgsCall" . }}, res)
+		if err != nil {
+			return err
+		}
+*/}}
 		err = s.execUpdate{{ export $.Types.Plural }}(
 			ctx,
 			{{ template "filterByPrimaryKeys" $.Fields.PrimaryKeyFields }},
@@ -411,10 +414,12 @@ func (s Store) {{ toggleExport .Delete.Export "Upsert" $.Types.Singular }}(ctx c
 			return err
 		}
 
-		// err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Upsert{{ template "extraArgsCall" . }}, res)
-		// if err != nil {
-		// 	return err
-		// }
+{{/*
+		err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Upsert{{ template "extraArgsCall" . }}, res)
+		if err != nil {
+			return err
+		}
+*/}}
 
 		err = s.config.ErrorHandler(s.execUpsert{{ export $.Types.Plural }}(ctx, s.internal{{ export $.Types.Singular }}Encoder(res)))
 		if err != nil {
@@ -430,11 +435,12 @@ func (s Store) {{ toggleExport .Delete.Export "Upsert" $.Types.Singular }}(ctx c
 // {{ toggleExport .Delete.Export "Delete" $.Types.Singular }} Deletes one or more rows from {{ $.RDBMS.Table }} table
 func (s Store) {{ toggleExport .Delete.Export "Delete" $.Types.Singular }}(ctx context.Context{{ template "extraArgsDef" . }}, rr ... *{{ $.Types.GoType }}) (err error) {
 	for _, res := range rr {
-		// err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Delete{{ template "extraArgsCall" . }}, res)
-		// if err != nil {
-		// 	return err
-		// }
-
+{{/*
+		err = s.{{ unexport $.Types.Singular }}Hook(ctx, TriggerBefore{{ export $.Types.Singular }}Delete{{ template "extraArgsCall" . }}, res)
+		if err != nil {
+			return err
+		}
+*/}}
 		err = s.execDelete{{ export $.Types.Plural }}(ctx,{{ template "filterByPrimaryKeys" $.Fields.PrimaryKeyFields }})
 		if err != nil {
 			return s.config.ErrorHandler(err)
@@ -666,13 +672,15 @@ func (s *Store) check{{ export $.Types.Singular }}Constraints(ctx context.Contex
 	return nil
 }
 
-// func (s *Store) {{ unexport $.Types.Singular }}Hook(ctx context.Context, key triggerKey{{ template "extraArgsDef" . }}, res *{{ $.Types.GoType }}) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store{{ template "extraArgsDef" . }}, res *{{ $.Types.GoType }}) error)(ctx, s{{ template "extraArgsCall" . }}, res)
-// 	}
-//
-// 	return nil
-// }
+{{/*
+func (s *Store) {{ unexport $.Types.Singular }}Hook(ctx context.Context, key triggerKey{{ template "extraArgsDef" . }}, res *{{ $.Types.GoType }}) error {
+	if fn, has := s.config.TriggerHandlers[key]; has {
+		return fn.(func (ctx context.Context, s *Store{{ template "extraArgsDef" . }}, res *{{ $.Types.GoType }}) error)(ctx, s{{ template "extraArgsCall" . }}, res)
+	}
+
+	return nil
+}
+*/}}
 
 
 {{/* ************************************************************ */}}
diff --git a/store/compose_records.gen.go b/store/compose_records.gen.go
index dfd6a2f2e..2e5dc012a 100644
--- a/store/compose_records.gen.go
+++ b/store/compose_records.gen.go
@@ -33,7 +33,7 @@ type (
 		// Additional custom functions
 
 		// ComposeRecordReport (custom function)
-		ComposeRecordReport(ctx context.Context, _mod *types.Module, _metrics string, _dimensions string, _filters string) (ComposeRecordsReport, error)
+		ComposeRecordReport(ctx context.Context, _mod *types.Module, _metrics string, _dimensions string, _filters string) ([]map[string]interface{}, error)
 	}
 )
 
@@ -86,6 +86,6 @@ func TruncateComposeRecords(ctx context.Context, s ComposeRecords, _mod *types.M
 	return s.TruncateComposeRecords(ctx, _mod)
 }
 
-func ComposeRecordReport(ctx context.Context, s ComposeRecords, _mod *types.Module, _metrics string, _dimensions string, _filters string) (ComposeRecordsReport, error) {
+func ComposeRecordReport(ctx context.Context, s ComposeRecords, _mod *types.Module, _metrics string, _dimensions string, _filters string) ([]map[string]interface{}, error) {
 	return s.ComposeRecordReport(ctx, _mod, _metrics, _dimensions, _filters)
 }
diff --git a/store/compose_records.yaml b/store/compose_records.yaml
index f99d085ac..051857b0c 100644
--- a/store/compose_records.yaml
+++ b/store/compose_records.yaml
@@ -23,7 +23,7 @@ functions:
       - { name: metrics,    type: string }
       - { name: dimensions, type: string }
       - { name: filters,    type: string }
-    return: [ ComposeRecordsReport, error ]
+    return: [ "[]map[string]interface{}", error ]
 
 lookups:
   - fields: [ ID ]
diff --git a/store/rdbms/actionlog.gen.go b/store/rdbms/actionlog.gen.go
index f7cf7abaa..a0045ebac 100644
--- a/store/rdbms/actionlog.gen.go
+++ b/store/rdbms/actionlog.gen.go
@@ -211,11 +211,6 @@ func (s Store) CreateActionlog(ctx context.Context, rr ...*actionlog.Action) (er
 			return err
 		}
 
-		// err = s.actionlogHook(ctx, TriggerBeforeActionlogCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateActionlogs(ctx, s.internalActionlogEncoder(res))
 		if err != nil {
 			return err
@@ -357,11 +352,3 @@ func (s *Store) checkActionlogConstraints(ctx context.Context, res *actionlog.Ac
 
 	return nil
 }
-
-// func (s *Store) actionlogHook(ctx context.Context, key triggerKey, res *actionlog.Action) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *actionlog.Action) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/applications.gen.go b/store/rdbms/applications.gen.go
index 31ce90a0d..76b13d138 100644
--- a/store/rdbms/applications.gen.go
+++ b/store/rdbms/applications.gen.go
@@ -254,11 +254,6 @@ func (s Store) CreateApplication(ctx context.Context, rr ...*types.Application)
 			return err
 		}
 
-		// err = s.applicationHook(ctx, TriggerBeforeApplicationCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateApplications(ctx, s.internalApplicationEncoder(res))
 		if err != nil {
 			return err
@@ -281,11 +276,6 @@ func (s Store) PartialApplicationUpdate(ctx context.Context, onlyColumns []strin
 			return err
 		}
 
-		// err = s.applicationHook(ctx, TriggerBeforeApplicationUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateApplications(
 			ctx,
 			squirrel.Eq{
@@ -308,11 +298,6 @@ func (s Store) UpsertApplication(ctx context.Context, rr ...*types.Application)
 			return err
 		}
 
-		// err = s.applicationHook(ctx, TriggerBeforeApplicationUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertApplications(ctx, s.internalApplicationEncoder(res)))
 		if err != nil {
 			return err
@@ -325,10 +310,6 @@ func (s Store) UpsertApplication(ctx context.Context, rr ...*types.Application)
 // DeleteApplication Deletes one or more rows from applications table
 func (s Store) DeleteApplication(ctx context.Context, rr ...*types.Application) (err error) {
 	for _, res := range rr {
-		// err = s.applicationHook(ctx, TriggerBeforeApplicationDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteApplications(ctx, squirrel.Eq{
 			s.preprocessColumn("app.id", ""): s.preprocessValue(res.ID, ""),
@@ -541,11 +522,3 @@ func (s *Store) checkApplicationConstraints(ctx context.Context, res *types.Appl
 
 	return nil
 }
-
-// func (s *Store) applicationHook(ctx context.Context, key triggerKey, res *types.Application) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Application) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/attachments.gen.go b/store/rdbms/attachments.gen.go
index 0118725ca..d01ce6e4e 100644
--- a/store/rdbms/attachments.gen.go
+++ b/store/rdbms/attachments.gen.go
@@ -112,11 +112,6 @@ func (s Store) CreateAttachment(ctx context.Context, rr ...*types.Attachment) (e
 			return err
 		}
 
-		// err = s.attachmentHook(ctx, TriggerBeforeAttachmentCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateAttachments(ctx, s.internalAttachmentEncoder(res))
 		if err != nil {
 			return err
@@ -139,11 +134,6 @@ func (s Store) PartialAttachmentUpdate(ctx context.Context, onlyColumns []string
 			return err
 		}
 
-		// err = s.attachmentHook(ctx, TriggerBeforeAttachmentUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateAttachments(
 			ctx,
 			squirrel.Eq{
@@ -166,11 +156,6 @@ func (s Store) UpsertAttachment(ctx context.Context, rr ...*types.Attachment) (e
 			return err
 		}
 
-		// err = s.attachmentHook(ctx, TriggerBeforeAttachmentUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertAttachments(ctx, s.internalAttachmentEncoder(res)))
 		if err != nil {
 			return err
@@ -183,10 +168,6 @@ func (s Store) UpsertAttachment(ctx context.Context, rr ...*types.Attachment) (e
 // DeleteAttachment Deletes one or more rows from attachments table
 func (s Store) DeleteAttachment(ctx context.Context, rr ...*types.Attachment) (err error) {
 	for _, res := range rr {
-		// err = s.attachmentHook(ctx, TriggerBeforeAttachmentDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteAttachments(ctx, squirrel.Eq{
 			s.preprocessColumn("att.id", ""): s.preprocessValue(res.ID, ""),
@@ -357,11 +338,3 @@ func (s *Store) checkAttachmentConstraints(ctx context.Context, res *types.Attac
 
 	return nil
 }
-
-// func (s *Store) attachmentHook(ctx context.Context, key triggerKey, res *types.Attachment) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Attachment) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_attachments.gen.go b/store/rdbms/compose_attachments.gen.go
index 63767408b..8603d0d9c 100644
--- a/store/rdbms/compose_attachments.gen.go
+++ b/store/rdbms/compose_attachments.gen.go
@@ -112,11 +112,6 @@ func (s Store) CreateComposeAttachment(ctx context.Context, rr ...*types.Attachm
 			return err
 		}
 
-		// err = s.composeAttachmentHook(ctx, TriggerBeforeComposeAttachmentCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeAttachments(ctx, s.internalComposeAttachmentEncoder(res))
 		if err != nil {
 			return err
@@ -139,11 +134,6 @@ func (s Store) PartialComposeAttachmentUpdate(ctx context.Context, onlyColumns [
 			return err
 		}
 
-		// err = s.composeAttachmentHook(ctx, TriggerBeforeComposeAttachmentUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeAttachments(
 			ctx,
 			squirrel.Eq{
@@ -166,11 +156,6 @@ func (s Store) UpsertComposeAttachment(ctx context.Context, rr ...*types.Attachm
 			return err
 		}
 
-		// err = s.composeAttachmentHook(ctx, TriggerBeforeComposeAttachmentUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeAttachments(ctx, s.internalComposeAttachmentEncoder(res)))
 		if err != nil {
 			return err
@@ -183,10 +168,6 @@ func (s Store) UpsertComposeAttachment(ctx context.Context, rr ...*types.Attachm
 // DeleteComposeAttachment Deletes one or more rows from compose_attachment table
 func (s Store) DeleteComposeAttachment(ctx context.Context, rr ...*types.Attachment) (err error) {
 	for _, res := range rr {
-		// err = s.composeAttachmentHook(ctx, TriggerBeforeComposeAttachmentDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeAttachments(ctx, squirrel.Eq{
 			s.preprocessColumn("att.id", ""): s.preprocessValue(res.ID, ""),
@@ -360,11 +341,3 @@ func (s *Store) checkComposeAttachmentConstraints(ctx context.Context, res *type
 
 	return nil
 }
-
-// func (s *Store) composeAttachmentHook(ctx context.Context, key triggerKey, res *types.Attachment) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Attachment) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_charts.gen.go b/store/rdbms/compose_charts.gen.go
index 433423096..d89c246e7 100644
--- a/store/rdbms/compose_charts.gen.go
+++ b/store/rdbms/compose_charts.gen.go
@@ -262,11 +262,6 @@ func (s Store) CreateComposeChart(ctx context.Context, rr ...*types.Chart) (err
 			return err
 		}
 
-		// err = s.composeChartHook(ctx, TriggerBeforeComposeChartCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeCharts(ctx, s.internalComposeChartEncoder(res))
 		if err != nil {
 			return err
@@ -289,11 +284,6 @@ func (s Store) PartialComposeChartUpdate(ctx context.Context, onlyColumns []stri
 			return err
 		}
 
-		// err = s.composeChartHook(ctx, TriggerBeforeComposeChartUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeCharts(
 			ctx,
 			squirrel.Eq{
@@ -316,11 +306,6 @@ func (s Store) UpsertComposeChart(ctx context.Context, rr ...*types.Chart) (err
 			return err
 		}
 
-		// err = s.composeChartHook(ctx, TriggerBeforeComposeChartUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeCharts(ctx, s.internalComposeChartEncoder(res)))
 		if err != nil {
 			return err
@@ -333,10 +318,6 @@ func (s Store) UpsertComposeChart(ctx context.Context, rr ...*types.Chart) (err
 // DeleteComposeChart Deletes one or more rows from compose_chart table
 func (s Store) DeleteComposeChart(ctx context.Context, rr ...*types.Chart) (err error) {
 	for _, res := range rr {
-		// err = s.composeChartHook(ctx, TriggerBeforeComposeChartDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeCharts(ctx, squirrel.Eq{
 			s.preprocessColumn("cch.id", ""): s.preprocessValue(res.ID, ""),
@@ -553,11 +534,3 @@ func (s *Store) checkComposeChartConstraints(ctx context.Context, res *types.Cha
 
 	return nil
 }
-
-// func (s *Store) composeChartHook(ctx context.Context, key triggerKey, res *types.Chart) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Chart) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_module_fields.gen.go b/store/rdbms/compose_module_fields.gen.go
index a37910d65..bc2836320 100644
--- a/store/rdbms/compose_module_fields.gen.go
+++ b/store/rdbms/compose_module_fields.gen.go
@@ -97,11 +97,6 @@ func (s Store) CreateComposeModuleField(ctx context.Context, rr ...*types.Module
 			return err
 		}
 
-		// err = s.composeModuleFieldHook(ctx, TriggerBeforeComposeModuleFieldCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeModuleFields(ctx, s.internalComposeModuleFieldEncoder(res))
 		if err != nil {
 			return err
@@ -124,11 +119,6 @@ func (s Store) PartialComposeModuleFieldUpdate(ctx context.Context, onlyColumns
 			return err
 		}
 
-		// err = s.composeModuleFieldHook(ctx, TriggerBeforeComposeModuleFieldUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeModuleFields(
 			ctx,
 			squirrel.Eq{
@@ -151,11 +141,6 @@ func (s Store) UpsertComposeModuleField(ctx context.Context, rr ...*types.Module
 			return err
 		}
 
-		// err = s.composeModuleFieldHook(ctx, TriggerBeforeComposeModuleFieldUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeModuleFields(ctx, s.internalComposeModuleFieldEncoder(res)))
 		if err != nil {
 			return err
@@ -168,10 +153,6 @@ func (s Store) UpsertComposeModuleField(ctx context.Context, rr ...*types.Module
 // DeleteComposeModuleField Deletes one or more rows from compose_module_field table
 func (s Store) DeleteComposeModuleField(ctx context.Context, rr ...*types.ModuleField) (err error) {
 	for _, res := range rr {
-		// err = s.composeModuleFieldHook(ctx, TriggerBeforeComposeModuleFieldDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeModuleFields(ctx, squirrel.Eq{
 			s.preprocessColumn("cmf.id", ""): s.preprocessValue(res.ID, ""),
@@ -366,11 +347,3 @@ func (s *Store) checkComposeModuleFieldConstraints(ctx context.Context, res *typ
 
 	return nil
 }
-
-// func (s *Store) composeModuleFieldHook(ctx context.Context, key triggerKey, res *types.ModuleField) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.ModuleField) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_modules.gen.go b/store/rdbms/compose_modules.gen.go
index 6e454d6a2..e299c9710 100644
--- a/store/rdbms/compose_modules.gen.go
+++ b/store/rdbms/compose_modules.gen.go
@@ -270,11 +270,6 @@ func (s Store) CreateComposeModule(ctx context.Context, rr ...*types.Module) (er
 			return err
 		}
 
-		// err = s.composeModuleHook(ctx, TriggerBeforeComposeModuleCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeModules(ctx, s.internalComposeModuleEncoder(res))
 		if err != nil {
 			return err
@@ -297,11 +292,6 @@ func (s Store) PartialComposeModuleUpdate(ctx context.Context, onlyColumns []str
 			return err
 		}
 
-		// err = s.composeModuleHook(ctx, TriggerBeforeComposeModuleUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeModules(
 			ctx,
 			squirrel.Eq{
@@ -324,11 +314,6 @@ func (s Store) UpsertComposeModule(ctx context.Context, rr ...*types.Module) (er
 			return err
 		}
 
-		// err = s.composeModuleHook(ctx, TriggerBeforeComposeModuleUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeModules(ctx, s.internalComposeModuleEncoder(res)))
 		if err != nil {
 			return err
@@ -341,10 +326,6 @@ func (s Store) UpsertComposeModule(ctx context.Context, rr ...*types.Module) (er
 // DeleteComposeModule Deletes one or more rows from compose_module table
 func (s Store) DeleteComposeModule(ctx context.Context, rr ...*types.Module) (err error) {
 	for _, res := range rr {
-		// err = s.composeModuleHook(ctx, TriggerBeforeComposeModuleDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeModules(ctx, squirrel.Eq{
 			s.preprocessColumn("cmd.id", ""): s.preprocessValue(res.ID, ""),
@@ -570,11 +551,3 @@ func (s *Store) checkComposeModuleConstraints(ctx context.Context, res *types.Mo
 
 	return nil
 }
-
-// func (s *Store) composeModuleHook(ctx context.Context, key triggerKey, res *types.Module) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Module) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_namespaces.gen.go b/store/rdbms/compose_namespaces.gen.go
index 5d1f2eb04..242894fbc 100644
--- a/store/rdbms/compose_namespaces.gen.go
+++ b/store/rdbms/compose_namespaces.gen.go
@@ -261,11 +261,6 @@ func (s Store) CreateComposeNamespace(ctx context.Context, rr ...*types.Namespac
 			return err
 		}
 
-		// err = s.composeNamespaceHook(ctx, TriggerBeforeComposeNamespaceCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeNamespaces(ctx, s.internalComposeNamespaceEncoder(res))
 		if err != nil {
 			return err
@@ -288,11 +283,6 @@ func (s Store) PartialComposeNamespaceUpdate(ctx context.Context, onlyColumns []
 			return err
 		}
 
-		// err = s.composeNamespaceHook(ctx, TriggerBeforeComposeNamespaceUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeNamespaces(
 			ctx,
 			squirrel.Eq{
@@ -315,11 +305,6 @@ func (s Store) UpsertComposeNamespace(ctx context.Context, rr ...*types.Namespac
 			return err
 		}
 
-		// err = s.composeNamespaceHook(ctx, TriggerBeforeComposeNamespaceUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeNamespaces(ctx, s.internalComposeNamespaceEncoder(res)))
 		if err != nil {
 			return err
@@ -332,10 +317,6 @@ func (s Store) UpsertComposeNamespace(ctx context.Context, rr ...*types.Namespac
 // DeleteComposeNamespace Deletes one or more rows from compose_namespace table
 func (s Store) DeleteComposeNamespace(ctx context.Context, rr ...*types.Namespace) (err error) {
 	for _, res := range rr {
-		// err = s.composeNamespaceHook(ctx, TriggerBeforeComposeNamespaceDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeNamespaces(ctx, squirrel.Eq{
 			s.preprocessColumn("cns.id", ""): s.preprocessValue(res.ID, ""),
@@ -561,11 +542,3 @@ func (s *Store) checkComposeNamespaceConstraints(ctx context.Context, res *types
 
 	return nil
 }
-
-// func (s *Store) composeNamespaceHook(ctx context.Context, key triggerKey, res *types.Namespace) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Namespace) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_pages.gen.go b/store/rdbms/compose_pages.gen.go
index 5dbcb0c3a..b95aca24b 100644
--- a/store/rdbms/compose_pages.gen.go
+++ b/store/rdbms/compose_pages.gen.go
@@ -270,11 +270,6 @@ func (s Store) CreateComposePage(ctx context.Context, rr ...*types.Page) (err er
 			return err
 		}
 
-		// err = s.composePageHook(ctx, TriggerBeforeComposePageCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposePages(ctx, s.internalComposePageEncoder(res))
 		if err != nil {
 			return err
@@ -297,11 +292,6 @@ func (s Store) PartialComposePageUpdate(ctx context.Context, onlyColumns []strin
 			return err
 		}
 
-		// err = s.composePageHook(ctx, TriggerBeforeComposePageUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposePages(
 			ctx,
 			squirrel.Eq{
@@ -324,11 +314,6 @@ func (s Store) UpsertComposePage(ctx context.Context, rr ...*types.Page) (err er
 			return err
 		}
 
-		// err = s.composePageHook(ctx, TriggerBeforeComposePageUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposePages(ctx, s.internalComposePageEncoder(res)))
 		if err != nil {
 			return err
@@ -341,10 +326,6 @@ func (s Store) UpsertComposePage(ctx context.Context, rr ...*types.Page) (err er
 // DeleteComposePage Deletes one or more rows from compose_page table
 func (s Store) DeleteComposePage(ctx context.Context, rr ...*types.Page) (err error) {
 	for _, res := range rr {
-		// err = s.composePageHook(ctx, TriggerBeforeComposePageDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposePages(ctx, squirrel.Eq{
 			s.preprocessColumn("cpg.id", ""): s.preprocessValue(res.ID, ""),
@@ -569,11 +550,3 @@ func (s *Store) checkComposePageConstraints(ctx context.Context, res *types.Page
 
 	return nil
 }
-
-// func (s *Store) composePageHook(ctx context.Context, key triggerKey, res *types.Page) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Page) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_record_values.gen.go b/store/rdbms/compose_record_values.gen.go
index 1a90cb369..5ce68c0de 100644
--- a/store/rdbms/compose_record_values.gen.go
+++ b/store/rdbms/compose_record_values.gen.go
@@ -89,11 +89,6 @@ func (s Store) createComposeRecordValue(ctx context.Context, _mod *types.Module,
 			return err
 		}
 
-		// err = s.composeRecordValueHook(ctx, TriggerBeforeComposeRecordValueCreate, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeRecordValues(ctx, s.internalComposeRecordValueEncoder(res))
 		if err != nil {
 			return err
@@ -116,11 +111,6 @@ func (s Store) partialComposeRecordValueUpdate(ctx context.Context, _mod *types.
 			return err
 		}
 
-		// err = s.composeRecordValueHook(ctx, TriggerBeforeComposeRecordValueUpdate, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeRecordValues(
 			ctx,
 			squirrel.Eq{
@@ -143,11 +133,6 @@ func (s Store) upsertComposeRecordValue(ctx context.Context, _mod *types.Module,
 			return err
 		}
 
-		// err = s.composeRecordValueHook(ctx, TriggerBeforeComposeRecordValueUpsert, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeRecordValues(ctx, s.internalComposeRecordValueEncoder(res)))
 		if err != nil {
 			return err
@@ -160,10 +145,6 @@ func (s Store) upsertComposeRecordValue(ctx context.Context, _mod *types.Module,
 // deleteComposeRecordValue Deletes one or more rows from compose_record_value table
 func (s Store) deleteComposeRecordValue(ctx context.Context, _mod *types.Module, rr ...*types.RecordValue) (err error) {
 	for _, res := range rr {
-		// err = s.composeRecordValueHook(ctx, TriggerBeforeComposeRecordValueDelete, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeRecordValues(ctx, squirrel.Eq{
 			s.preprocessColumn("crv.record_id", ""): s.preprocessValue(res.RecordID, ""), s.preprocessColumn("crv.name", ""): s.preprocessValue(res.Name, ""), s.preprocessColumn("crv.place", ""): s.preprocessValue(res.Place, ""),
@@ -326,11 +307,3 @@ func (s *Store) checkComposeRecordValueConstraints(ctx context.Context, _mod *ty
 
 	return nil
 }
-
-// func (s *Store) composeRecordValueHook(ctx context.Context, key triggerKey, _mod  *types.Module, res *types.RecordValue) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, _mod  *types.Module, res *types.RecordValue) error)(ctx, s, _mod, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/compose_records.gen.go b/store/rdbms/compose_records.gen.go
index 6b7b26f13..25979cfc6 100644
--- a/store/rdbms/compose_records.gen.go
+++ b/store/rdbms/compose_records.gen.go
@@ -253,11 +253,6 @@ func (s Store) createComposeRecord(ctx context.Context, _mod *types.Module, rr .
 			return err
 		}
 
-		// err = s.composeRecordHook(ctx, TriggerBeforeComposeRecordCreate, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateComposeRecords(ctx, s.internalComposeRecordEncoder(res))
 		if err != nil {
 			return err
@@ -280,11 +275,6 @@ func (s Store) partialComposeRecordUpdate(ctx context.Context, _mod *types.Modul
 			return err
 		}
 
-		// err = s.composeRecordHook(ctx, TriggerBeforeComposeRecordUpdate, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateComposeRecords(
 			ctx,
 			squirrel.Eq{
@@ -307,11 +297,6 @@ func (s Store) upsertComposeRecord(ctx context.Context, _mod *types.Module, rr .
 			return err
 		}
 
-		// err = s.composeRecordHook(ctx, TriggerBeforeComposeRecordUpsert, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertComposeRecords(ctx, s.internalComposeRecordEncoder(res)))
 		if err != nil {
 			return err
@@ -324,10 +309,6 @@ func (s Store) upsertComposeRecord(ctx context.Context, _mod *types.Module, rr .
 // deleteComposeRecord Deletes one or more rows from compose_record table
 func (s Store) deleteComposeRecord(ctx context.Context, _mod *types.Module, rr ...*types.Record) (err error) {
 	for _, res := range rr {
-		// err = s.composeRecordHook(ctx, TriggerBeforeComposeRecordDelete, _mod, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteComposeRecords(ctx, squirrel.Eq{
 			s.preprocessColumn("crd.id", ""): s.preprocessValue(res.ID, ""),
@@ -543,11 +524,3 @@ func (s *Store) checkComposeRecordConstraints(ctx context.Context, _mod *types.M
 
 	return nil
 }
-
-// func (s *Store) composeRecordHook(ctx context.Context, key triggerKey, _mod  *types.Module, res *types.Record) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, _mod  *types.Module, res *types.Record) error)(ctx, s, _mod, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/credentials.gen.go b/store/rdbms/credentials.gen.go
index db408fbe5..fbb432e2e 100644
--- a/store/rdbms/credentials.gen.go
+++ b/store/rdbms/credentials.gen.go
@@ -98,11 +98,6 @@ func (s Store) CreateCredentials(ctx context.Context, rr ...*types.Credentials)
 			return err
 		}
 
-		// err = s.credentialsHook(ctx, TriggerBeforeCredentialsCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateCredentials(ctx, s.internalCredentialsEncoder(res))
 		if err != nil {
 			return err
@@ -125,11 +120,6 @@ func (s Store) PartialCredentialsUpdate(ctx context.Context, onlyColumns []strin
 			return err
 		}
 
-		// err = s.credentialsHook(ctx, TriggerBeforeCredentialsUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateCredentials(
 			ctx,
 			squirrel.Eq{
@@ -152,11 +142,6 @@ func (s Store) UpsertCredentials(ctx context.Context, rr ...*types.Credentials)
 			return err
 		}
 
-		// err = s.credentialsHook(ctx, TriggerBeforeCredentialsUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertCredentials(ctx, s.internalCredentialsEncoder(res)))
 		if err != nil {
 			return err
@@ -169,10 +154,6 @@ func (s Store) UpsertCredentials(ctx context.Context, rr ...*types.Credentials)
 // DeleteCredentials Deletes one or more rows from credentials table
 func (s Store) DeleteCredentials(ctx context.Context, rr ...*types.Credentials) (err error) {
 	for _, res := range rr {
-		// err = s.credentialsHook(ctx, TriggerBeforeCredentialsDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteCredentials(ctx, squirrel.Eq{
 			s.preprocessColumn("crd.id", ""): s.preprocessValue(res.ID, ""),
@@ -346,11 +327,3 @@ func (s *Store) checkCredentialsConstraints(ctx context.Context, res *types.Cred
 
 	return nil
 }
-
-// func (s *Store) credentialsHook(ctx context.Context, key triggerKey, res *types.Credentials) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Credentials) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/rbac_rules.gen.go b/store/rdbms/rbac_rules.gen.go
index 430e0d625..1c48e6010 100644
--- a/store/rdbms/rbac_rules.gen.go
+++ b/store/rdbms/rbac_rules.gen.go
@@ -86,11 +86,6 @@ func (s Store) CreateRbacRule(ctx context.Context, rr ...*permissions.Rule) (err
 			return err
 		}
 
-		// err = s.rbacRuleHook(ctx, TriggerBeforeRbacRuleCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateRbacRules(ctx, s.internalRbacRuleEncoder(res))
 		if err != nil {
 			return err
@@ -113,11 +108,6 @@ func (s Store) PartialRbacRuleUpdate(ctx context.Context, onlyColumns []string,
 			return err
 		}
 
-		// err = s.rbacRuleHook(ctx, TriggerBeforeRbacRuleUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateRbacRules(
 			ctx,
 			squirrel.Eq{
@@ -140,11 +130,6 @@ func (s Store) UpsertRbacRule(ctx context.Context, rr ...*permissions.Rule) (err
 			return err
 		}
 
-		// err = s.rbacRuleHook(ctx, TriggerBeforeRbacRuleUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertRbacRules(ctx, s.internalRbacRuleEncoder(res)))
 		if err != nil {
 			return err
@@ -157,10 +142,6 @@ func (s Store) UpsertRbacRule(ctx context.Context, rr ...*permissions.Rule) (err
 // DeleteRbacRule Deletes one or more rows from rbac_rules table
 func (s Store) DeleteRbacRule(ctx context.Context, rr ...*permissions.Rule) (err error) {
 	for _, res := range rr {
-		// err = s.rbacRuleHook(ctx, TriggerBeforeRbacRuleDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteRbacRules(ctx, squirrel.Eq{
 			s.preprocessColumn("rls.rel_role", ""): s.preprocessValue(res.RoleID, ""), s.preprocessColumn("rls.resource", ""): s.preprocessValue(res.Resource, ""), s.preprocessColumn("rls.operation", ""): s.preprocessValue(res.Operation, ""),
@@ -317,11 +298,3 @@ func (s *Store) checkRbacRuleConstraints(ctx context.Context, res *permissions.R
 
 	return nil
 }
-
-// func (s *Store) rbacRuleHook(ctx context.Context, key triggerKey, res *permissions.Rule) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *permissions.Rule) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/reminders.gen.go b/store/rdbms/reminders.gen.go
index 83b5acfa8..d8c65e61b 100644
--- a/store/rdbms/reminders.gen.go
+++ b/store/rdbms/reminders.gen.go
@@ -254,11 +254,6 @@ func (s Store) CreateReminder(ctx context.Context, rr ...*types.Reminder) (err e
 			return err
 		}
 
-		// err = s.reminderHook(ctx, TriggerBeforeReminderCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateReminders(ctx, s.internalReminderEncoder(res))
 		if err != nil {
 			return err
@@ -281,11 +276,6 @@ func (s Store) PartialReminderUpdate(ctx context.Context, onlyColumns []string,
 			return err
 		}
 
-		// err = s.reminderHook(ctx, TriggerBeforeReminderUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateReminders(
 			ctx,
 			squirrel.Eq{
@@ -308,11 +298,6 @@ func (s Store) UpsertReminder(ctx context.Context, rr ...*types.Reminder) (err e
 			return err
 		}
 
-		// err = s.reminderHook(ctx, TriggerBeforeReminderUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertReminders(ctx, s.internalReminderEncoder(res)))
 		if err != nil {
 			return err
@@ -325,10 +310,6 @@ func (s Store) UpsertReminder(ctx context.Context, rr ...*types.Reminder) (err e
 // DeleteReminder Deletes one or more rows from reminders table
 func (s Store) DeleteReminder(ctx context.Context, rr ...*types.Reminder) (err error) {
 	for _, res := range rr {
-		// err = s.reminderHook(ctx, TriggerBeforeReminderDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteReminders(ctx, squirrel.Eq{
 			s.preprocessColumn("rmd.id", ""): s.preprocessValue(res.ID, ""),
@@ -556,11 +537,3 @@ func (s *Store) checkReminderConstraints(ctx context.Context, res *types.Reminde
 
 	return nil
 }
-
-// func (s *Store) reminderHook(ctx context.Context, key triggerKey, res *types.Reminder) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Reminder) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/role_members.gen.go b/store/rdbms/role_members.gen.go
index 77c5907a8..bd54ef37f 100644
--- a/store/rdbms/role_members.gen.go
+++ b/store/rdbms/role_members.gen.go
@@ -86,11 +86,6 @@ func (s Store) CreateRoleMember(ctx context.Context, rr ...*types.RoleMember) (e
 			return err
 		}
 
-		// err = s.roleMemberHook(ctx, TriggerBeforeRoleMemberCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateRoleMembers(ctx, s.internalRoleMemberEncoder(res))
 		if err != nil {
 			return err
@@ -113,11 +108,6 @@ func (s Store) PartialRoleMemberUpdate(ctx context.Context, onlyColumns []string
 			return err
 		}
 
-		// err = s.roleMemberHook(ctx, TriggerBeforeRoleMemberUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateRoleMembers(
 			ctx,
 			squirrel.Eq{
@@ -140,11 +130,6 @@ func (s Store) UpsertRoleMember(ctx context.Context, rr ...*types.RoleMember) (e
 			return err
 		}
 
-		// err = s.roleMemberHook(ctx, TriggerBeforeRoleMemberUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertRoleMembers(ctx, s.internalRoleMemberEncoder(res)))
 		if err != nil {
 			return err
@@ -157,10 +142,6 @@ func (s Store) UpsertRoleMember(ctx context.Context, rr ...*types.RoleMember) (e
 // DeleteRoleMember Deletes one or more rows from role_members table
 func (s Store) DeleteRoleMember(ctx context.Context, rr ...*types.RoleMember) (err error) {
 	for _, res := range rr {
-		// err = s.roleMemberHook(ctx, TriggerBeforeRoleMemberDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteRoleMembers(ctx, squirrel.Eq{
 			s.preprocessColumn("rm.rel_user", ""): s.preprocessValue(res.UserID, ""), s.preprocessColumn("rm.rel_role", ""): s.preprocessValue(res.RoleID, ""),
@@ -309,11 +290,3 @@ func (s *Store) checkRoleMemberConstraints(ctx context.Context, res *types.RoleM
 
 	return nil
 }
-
-// func (s *Store) roleMemberHook(ctx context.Context, key triggerKey, res *types.RoleMember) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.RoleMember) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/roles.gen.go b/store/rdbms/roles.gen.go
index 85e4ef10e..b6383fd08 100644
--- a/store/rdbms/roles.gen.go
+++ b/store/rdbms/roles.gen.go
@@ -278,11 +278,6 @@ func (s Store) CreateRole(ctx context.Context, rr ...*types.Role) (err error) {
 			return err
 		}
 
-		// err = s.roleHook(ctx, TriggerBeforeRoleCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateRoles(ctx, s.internalRoleEncoder(res))
 		if err != nil {
 			return err
@@ -305,11 +300,6 @@ func (s Store) PartialRoleUpdate(ctx context.Context, onlyColumns []string, rr .
 			return err
 		}
 
-		// err = s.roleHook(ctx, TriggerBeforeRoleUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateRoles(
 			ctx,
 			squirrel.Eq{
@@ -332,11 +322,6 @@ func (s Store) UpsertRole(ctx context.Context, rr ...*types.Role) (err error) {
 			return err
 		}
 
-		// err = s.roleHook(ctx, TriggerBeforeRoleUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertRoles(ctx, s.internalRoleEncoder(res)))
 		if err != nil {
 			return err
@@ -349,10 +334,6 @@ func (s Store) UpsertRole(ctx context.Context, rr ...*types.Role) (err error) {
 // DeleteRole Deletes one or more rows from roles table
 func (s Store) DeleteRole(ctx context.Context, rr ...*types.Role) (err error) {
 	for _, res := range rr {
-		// err = s.roleHook(ctx, TriggerBeforeRoleDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteRoles(ctx, squirrel.Eq{
 			s.preprocessColumn("rl.id", ""): s.preprocessValue(res.ID, ""),
@@ -578,11 +559,3 @@ func (s *Store) checkRoleConstraints(ctx context.Context, res *types.Role) error
 
 	return nil
 }
-
-// func (s *Store) roleHook(ctx context.Context, key triggerKey, res *types.Role) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.Role) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/settings.gen.go b/store/rdbms/settings.gen.go
index d699ebd96..5fb2ce801 100644
--- a/store/rdbms/settings.gen.go
+++ b/store/rdbms/settings.gen.go
@@ -111,11 +111,6 @@ func (s Store) CreateSetting(ctx context.Context, rr ...*types.SettingValue) (er
 			return err
 		}
 
-		// err = s.settingHook(ctx, TriggerBeforeSettingCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateSettings(ctx, s.internalSettingEncoder(res))
 		if err != nil {
 			return err
@@ -138,11 +133,6 @@ func (s Store) PartialSettingUpdate(ctx context.Context, onlyColumns []string, r
 			return err
 		}
 
-		// err = s.settingHook(ctx, TriggerBeforeSettingUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateSettings(
 			ctx,
 			squirrel.Eq{
@@ -165,11 +155,6 @@ func (s Store) UpsertSetting(ctx context.Context, rr ...*types.SettingValue) (er
 			return err
 		}
 
-		// err = s.settingHook(ctx, TriggerBeforeSettingUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertSettings(ctx, s.internalSettingEncoder(res)))
 		if err != nil {
 			return err
@@ -182,10 +167,6 @@ func (s Store) UpsertSetting(ctx context.Context, rr ...*types.SettingValue) (er
 // DeleteSetting Deletes one or more rows from settings table
 func (s Store) DeleteSetting(ctx context.Context, rr ...*types.SettingValue) (err error) {
 	for _, res := range rr {
-		// err = s.settingHook(ctx, TriggerBeforeSettingDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteSettings(ctx, squirrel.Eq{
 			s.preprocessColumn("st.name", ""): s.preprocessValue(res.Name, ""), s.preprocessColumn("st.rel_owner", ""): s.preprocessValue(res.OwnedBy, ""),
@@ -343,11 +324,3 @@ func (s *Store) checkSettingConstraints(ctx context.Context, res *types.SettingV
 
 	return nil
 }
-
-// func (s *Store) settingHook(ctx context.Context, key triggerKey, res *types.SettingValue) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.SettingValue) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }
diff --git a/store/rdbms/users.gen.go b/store/rdbms/users.gen.go
index a19a86897..135d1a287 100644
--- a/store/rdbms/users.gen.go
+++ b/store/rdbms/users.gen.go
@@ -290,11 +290,6 @@ func (s Store) CreateUser(ctx context.Context, rr ...*types.User) (err error) {
 			return err
 		}
 
-		// err = s.userHook(ctx, TriggerBeforeUserCreate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execCreateUsers(ctx, s.internalUserEncoder(res))
 		if err != nil {
 			return err
@@ -317,11 +312,6 @@ func (s Store) PartialUserUpdate(ctx context.Context, onlyColumns []string, rr .
 			return err
 		}
 
-		// err = s.userHook(ctx, TriggerBeforeUserUpdate, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.execUpdateUsers(
 			ctx,
 			squirrel.Eq{
@@ -344,11 +334,6 @@ func (s Store) UpsertUser(ctx context.Context, rr ...*types.User) (err error) {
 			return err
 		}
 
-		// err = s.userHook(ctx, TriggerBeforeUserUpsert, res)
-		// if err != nil {
-		// 	return err
-		// }
-
 		err = s.config.ErrorHandler(s.execUpsertUsers(ctx, s.internalUserEncoder(res)))
 		if err != nil {
 			return err
@@ -361,10 +346,6 @@ func (s Store) UpsertUser(ctx context.Context, rr ...*types.User) (err error) {
 // DeleteUser Deletes one or more rows from users table
 func (s Store) DeleteUser(ctx context.Context, rr ...*types.User) (err error) {
 	for _, res := range rr {
-		// err = s.userHook(ctx, TriggerBeforeUserDelete, res)
-		// if err != nil {
-		// 	return err
-		// }
 
 		err = s.execDeleteUsers(ctx, squirrel.Eq{
 			s.preprocessColumn("usr.id", ""): s.preprocessValue(res.ID, ""),
@@ -631,11 +612,3 @@ func (s *Store) checkUserConstraints(ctx context.Context, res *types.User) error
 
 	return nil
 }
-
-// func (s *Store) userHook(ctx context.Context, key triggerKey, res *types.User) error {
-// 	if fn, has := s.config.TriggerHandlers[key]; has {
-// 		return fn.(func (ctx context.Context, s *Store, res *types.User) error)(ctx, s, res)
-// 	}
-//
-// 	return nil
-// }