diff --git a/pkg/codegen/assets/store_rdbms.gen.go.tpl b/pkg/codegen/assets/store_rdbms.gen.go.tpl
index 982053daf..7d2ac2dff 100644
--- a/pkg/codegen/assets/store_rdbms.gen.go.tpl
+++ b/pkg/codegen/assets/store_rdbms.gen.go.tpl
@@ -242,7 +242,7 @@ func (s Store) {{ unexport "fetchFullPageOf" $.Types.Plural  }} (
 // for next page of results
 func (s Store) {{ export "query" $.Types.Plural }} (
 	ctx context.Context{{ template "extraArgsDef" . }},
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*{{ $.Types.GoType }}) (bool, error),
 ) ([]*{{ $.Types.GoType }}, uint, *{{ $.Types.GoType }}, error) {
 	var (
diff --git a/store/rdbms/actionlog.gen.go b/store/rdbms/actionlog.gen.go
index 2b9bb1acf..e85bda5ab 100644
--- a/store/rdbms/actionlog.gen.go
+++ b/store/rdbms/actionlog.gen.go
@@ -174,7 +174,7 @@ func (s Store) fetchFullPageOfActionlogs(
 // for next page of results
 func (s Store) QueryActionlogs(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*actionlog.Action) (bool, error),
 ) ([]*actionlog.Action, uint, *actionlog.Action, error) {
 	var (
diff --git a/store/rdbms/applications.gen.go b/store/rdbms/applications.gen.go
index a242f9606..b526bbe53 100644
--- a/store/rdbms/applications.gen.go
+++ b/store/rdbms/applications.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfApplications(
 // for next page of results
 func (s Store) QueryApplications(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Application) (bool, error),
 ) ([]*types.Application, uint, *types.Application, error) {
 	var (
diff --git a/store/rdbms/attachments.gen.go b/store/rdbms/attachments.gen.go
index 4e8f02508..41914de0c 100644
--- a/store/rdbms/attachments.gen.go
+++ b/store/rdbms/attachments.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchAttachments(ctx context.Context, f types.AttachmentFilter)
 // for next page of results
 func (s Store) QueryAttachments(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Attachment) (bool, error),
 ) ([]*types.Attachment, uint, *types.Attachment, error) {
 	var (
diff --git a/store/rdbms/compose_attachments.gen.go b/store/rdbms/compose_attachments.gen.go
index d222741f8..67f3aaddb 100644
--- a/store/rdbms/compose_attachments.gen.go
+++ b/store/rdbms/compose_attachments.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchComposeAttachments(ctx context.Context, f types.AttachmentF
 // for next page of results
 func (s Store) QueryComposeAttachments(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Attachment) (bool, error),
 ) ([]*types.Attachment, uint, *types.Attachment, error) {
 	var (
diff --git a/store/rdbms/compose_charts.gen.go b/store/rdbms/compose_charts.gen.go
index 51bb59bb1..b6f486c3c 100644
--- a/store/rdbms/compose_charts.gen.go
+++ b/store/rdbms/compose_charts.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfComposeCharts(
 // for next page of results
 func (s Store) QueryComposeCharts(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Chart) (bool, error),
 ) ([]*types.Chart, uint, *types.Chart, error) {
 	var (
diff --git a/store/rdbms/compose_module_fields.gen.go b/store/rdbms/compose_module_fields.gen.go
index dab571564..15480751b 100644
--- a/store/rdbms/compose_module_fields.gen.go
+++ b/store/rdbms/compose_module_fields.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchComposeModuleFields(ctx context.Context, f types.ModuleFiel
 // for next page of results
 func (s Store) QueryComposeModuleFields(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.ModuleField) (bool, error),
 ) ([]*types.ModuleField, uint, *types.ModuleField, error) {
 	var (
diff --git a/store/rdbms/compose_modules.gen.go b/store/rdbms/compose_modules.gen.go
index 9face5d2c..ae29e48c2 100644
--- a/store/rdbms/compose_modules.gen.go
+++ b/store/rdbms/compose_modules.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfComposeModules(
 // for next page of results
 func (s Store) QueryComposeModules(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Module) (bool, error),
 ) ([]*types.Module, uint, *types.Module, error) {
 	var (
diff --git a/store/rdbms/compose_namespaces.gen.go b/store/rdbms/compose_namespaces.gen.go
index 9a6d68470..3c3976b6d 100644
--- a/store/rdbms/compose_namespaces.gen.go
+++ b/store/rdbms/compose_namespaces.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfComposeNamespaces(
 // for next page of results
 func (s Store) QueryComposeNamespaces(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Namespace) (bool, error),
 ) ([]*types.Namespace, uint, *types.Namespace, error) {
 	var (
diff --git a/store/rdbms/compose_pages.gen.go b/store/rdbms/compose_pages.gen.go
index 733815d18..9dd6d0cbf 100644
--- a/store/rdbms/compose_pages.gen.go
+++ b/store/rdbms/compose_pages.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfComposePages(
 // for next page of results
 func (s Store) QueryComposePages(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Page) (bool, error),
 ) ([]*types.Page, uint, *types.Page, error) {
 	var (
diff --git a/store/rdbms/compose_record_report_builder.go b/store/rdbms/compose_record_report_builder.go
index b75c6d60d..4db9b09c8 100644
--- a/store/rdbms/compose_record_report_builder.go
+++ b/store/rdbms/compose_record_report_builder.go
@@ -37,7 +37,7 @@ type (
 
 	recordReportBuilderStoreQuerier interface {
 		SelectBuilder(string, ...string) squirrel.SelectBuilder
-		Query(context.Context, squirrel.SelectBuilder) (*sql.Rows, error)
+		Query(context.Context, squirrel.Sqlizer) (*sql.Rows, error)
 		SqlFunctionHandler(f ql.Function) (ql.ASTNode, error)
 		FieldToColumnTypeCaster(f ModuleFieldTypeDetector, i ql.Ident) (ql.Ident, error)
 	}
diff --git a/store/rdbms/compose_record_values.gen.go b/store/rdbms/compose_record_values.gen.go
index 6e0be5db4..ec9187241 100644
--- a/store/rdbms/compose_record_values.gen.go
+++ b/store/rdbms/compose_record_values.gen.go
@@ -49,7 +49,7 @@ func (s Store) searchComposeRecordValues(ctx context.Context, _mod *types.Module
 // for next page of results
 func (s Store) QueryComposeRecordValues(
 	ctx context.Context, _mod *types.Module,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.RecordValue) (bool, error),
 ) ([]*types.RecordValue, uint, *types.RecordValue, error) {
 	var (
diff --git a/store/rdbms/compose_records.gen.go b/store/rdbms/compose_records.gen.go
index 951607c5d..b7d542809 100644
--- a/store/rdbms/compose_records.gen.go
+++ b/store/rdbms/compose_records.gen.go
@@ -172,7 +172,7 @@ func (s Store) fetchFullPageOfComposeRecords(
 // for next page of results
 func (s Store) QueryComposeRecords(
 	ctx context.Context, _mod *types.Module,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Record) (bool, error),
 ) ([]*types.Record, uint, *types.Record, error) {
 	var (
diff --git a/store/rdbms/credentials.gen.go b/store/rdbms/credentials.gen.go
index 16b235ded..7bcef31cb 100644
--- a/store/rdbms/credentials.gen.go
+++ b/store/rdbms/credentials.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchCredentials(ctx context.Context, f types.CredentialsFilter)
 // for next page of results
 func (s Store) QueryCredentials(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Credentials) (bool, error),
 ) ([]*types.Credentials, uint, *types.Credentials, error) {
 	var (
diff --git a/store/rdbms/messaging_attachments.gen.go b/store/rdbms/messaging_attachments.gen.go
index cffbedc7e..2abeda3e6 100644
--- a/store/rdbms/messaging_attachments.gen.go
+++ b/store/rdbms/messaging_attachments.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchMessagingAttachments(ctx context.Context, f types.Attachmen
 // for next page of results
 func (s Store) QueryMessagingAttachments(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Attachment) (bool, error),
 ) ([]*types.Attachment, uint, *types.Attachment, error) {
 	var (
diff --git a/store/rdbms/messaging_channel_members.gen.go b/store/rdbms/messaging_channel_members.gen.go
index 89b3103d7..ea7fa2c78 100644
--- a/store/rdbms/messaging_channel_members.gen.go
+++ b/store/rdbms/messaging_channel_members.gen.go
@@ -46,7 +46,7 @@ func (s Store) SearchMessagingChannelMembers(ctx context.Context, f types.Channe
 // for next page of results
 func (s Store) QueryMessagingChannelMembers(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.ChannelMember) (bool, error),
 ) ([]*types.ChannelMember, uint, *types.ChannelMember, error) {
 	var (
diff --git a/store/rdbms/messaging_channels.gen.go b/store/rdbms/messaging_channels.gen.go
index 343fdea62..c1812e837 100644
--- a/store/rdbms/messaging_channels.gen.go
+++ b/store/rdbms/messaging_channels.gen.go
@@ -170,7 +170,7 @@ func (s Store) fetchFullPageOfMessagingChannels(
 // for next page of results
 func (s Store) QueryMessagingChannels(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Channel) (bool, error),
 ) ([]*types.Channel, uint, *types.Channel, error) {
 	var (
diff --git a/store/rdbms/messaging_messages.gen.go b/store/rdbms/messaging_messages.gen.go
index 2fbf0fc60..25d2b20e1 100644
--- a/store/rdbms/messaging_messages.gen.go
+++ b/store/rdbms/messaging_messages.gen.go
@@ -46,7 +46,7 @@ func (s Store) SearchMessagingMessages(ctx context.Context, f types.MessageFilte
 // for next page of results
 func (s Store) QueryMessagingMessages(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Message) (bool, error),
 ) ([]*types.Message, uint, *types.Message, error) {
 	var (
diff --git a/store/rdbms/messaging_unread.gen.go b/store/rdbms/messaging_unread.gen.go
index 7f88cc837..a7aa351c0 100644
--- a/store/rdbms/messaging_unread.gen.go
+++ b/store/rdbms/messaging_unread.gen.go
@@ -27,7 +27,7 @@ var _ = errors.Is
 // for next page of results
 func (s Store) QueryMessagingUnreads(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Unread) (bool, error),
 ) ([]*types.Unread, uint, *types.Unread, error) {
 	var (
diff --git a/store/rdbms/rbac_rules.gen.go b/store/rdbms/rbac_rules.gen.go
index 1777c9858..e37478e34 100644
--- a/store/rdbms/rbac_rules.gen.go
+++ b/store/rdbms/rbac_rules.gen.go
@@ -46,7 +46,7 @@ func (s Store) SearchRbacRules(ctx context.Context, f permissions.RuleFilter) (p
 // for next page of results
 func (s Store) QueryRbacRules(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*permissions.Rule) (bool, error),
 ) ([]*permissions.Rule, uint, *permissions.Rule, error) {
 	var (
diff --git a/store/rdbms/rdbms.go b/store/rdbms/rdbms.go
index fe033deed..633d39554 100644
--- a/store/rdbms/rdbms.go
+++ b/store/rdbms/rdbms.go
@@ -205,7 +205,7 @@ func (s *Store) Connect(ctx context.Context) error {
 	return err
 }
 
-func (s Store) Query(ctx context.Context, q squirrel.SelectBuilder) (*sql.Rows, error) {
+func (s Store) Query(ctx context.Context, q squirrel.Sqlizer) (*sql.Rows, error) {
 	query, args, err := q.ToSql()
 	if err != nil {
 		return nil, fmt.Errorf("could not build query: %w", err)
diff --git a/store/rdbms/reminders.gen.go b/store/rdbms/reminders.gen.go
index 6e676802f..91332f690 100644
--- a/store/rdbms/reminders.gen.go
+++ b/store/rdbms/reminders.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfReminders(
 // for next page of results
 func (s Store) QueryReminders(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Reminder) (bool, error),
 ) ([]*types.Reminder, uint, *types.Reminder, error) {
 	var (
diff --git a/store/rdbms/role_members.gen.go b/store/rdbms/role_members.gen.go
index a691a391b..00669de52 100644
--- a/store/rdbms/role_members.gen.go
+++ b/store/rdbms/role_members.gen.go
@@ -46,7 +46,7 @@ func (s Store) SearchRoleMembers(ctx context.Context, f types.RoleMemberFilter)
 // for next page of results
 func (s Store) QueryRoleMembers(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.RoleMember) (bool, error),
 ) ([]*types.RoleMember, uint, *types.RoleMember, error) {
 	var (
diff --git a/store/rdbms/roles.gen.go b/store/rdbms/roles.gen.go
index 4a18b4469..b5d8e092e 100644
--- a/store/rdbms/roles.gen.go
+++ b/store/rdbms/roles.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfRoles(
 // for next page of results
 func (s Store) QueryRoles(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.Role) (bool, error),
 ) ([]*types.Role, uint, *types.Role, error) {
 	var (
diff --git a/store/rdbms/settings.gen.go b/store/rdbms/settings.gen.go
index de8bf5483..d5fb79984 100644
--- a/store/rdbms/settings.gen.go
+++ b/store/rdbms/settings.gen.go
@@ -49,7 +49,7 @@ func (s Store) SearchSettings(ctx context.Context, f types.SettingsFilter) (type
 // for next page of results
 func (s Store) QuerySettings(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.SettingValue) (bool, error),
 ) ([]*types.SettingValue, uint, *types.SettingValue, error) {
 	var (
diff --git a/store/rdbms/users.gen.go b/store/rdbms/users.gen.go
index 4f825dbc9..9e27c3be0 100644
--- a/store/rdbms/users.gen.go
+++ b/store/rdbms/users.gen.go
@@ -173,7 +173,7 @@ func (s Store) fetchFullPageOfUsers(
 // for next page of results
 func (s Store) QueryUsers(
 	ctx context.Context,
-	q squirrel.SelectBuilder,
+	q squirrel.Sqlizer,
 	check func(*types.User) (bool, error),
 ) ([]*types.User, uint, *types.User, error) {
 	var (