3
0

RDBMS store query handler now accepts sqlizer

This commit is contained in:
Denis Arh
2020-09-01 21:28:45 +02:00
parent 16aa32cd4b
commit 8dc5315b75
26 changed files with 26 additions and 26 deletions
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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)
}
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 (