From 8c3919d6a02a1f2878c5e10512baa8da4cebf468 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Sat, 1 Jun 2024 15:01:28 -0400
Subject: [PATCH] Simplify dbx wrapper
---
persistence/dbx_builder.go | 36 ++++--------------------------------
1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/persistence/dbx_builder.go b/persistence/dbx_builder.go
index bdb4dc5c3..4b7f27d2d 100644
--- a/persistence/dbx_builder.go
+++ b/persistence/dbx_builder.go
@@ -7,44 +7,16 @@ import (
type dbxBuilder struct {
dbx.Builder
- rdb dbx.Builder
+ wdb dbx.Builder
}
func NewDBXBuilder(d db.DB) *dbxBuilder {
b := &dbxBuilder{}
- b.Builder = dbx.NewFromDB(d.WriteDB(), db.Driver)
- b.rdb = dbx.NewFromDB(d.ReadDB(), db.Driver)
+ b.Builder = dbx.NewFromDB(d.ReadDB(), db.Driver)
+ b.wdb = dbx.NewFromDB(d.WriteDB(), db.Driver)
return b
}
-func (d *dbxBuilder) NewQuery(s string) *dbx.Query {
- return d.rdb.NewQuery(s)
-}
-
-func (d *dbxBuilder) Select(s ...string) *dbx.SelectQuery {
- return d.rdb.Select(s...)
-}
-
-func (d *dbxBuilder) GeneratePlaceholder(i int) string {
- return d.rdb.GeneratePlaceholder(i)
-}
-
-func (d *dbxBuilder) Quote(s string) string {
- return d.rdb.Quote(s)
-}
-
-func (d *dbxBuilder) QuoteSimpleTableName(s string) string {
- return d.rdb.QuoteSimpleTableName(s)
-}
-
-func (d *dbxBuilder) QuoteSimpleColumnName(s string) string {
- return d.rdb.QuoteSimpleColumnName(s)
-}
-
-func (d *dbxBuilder) QueryBuilder() dbx.QueryBuilder {
- return d.rdb.QueryBuilder()
-}
-
func (d *dbxBuilder) Transactional(f func(*dbx.Tx) error) (err error) {
- return d.Builder.(*dbx.DB).Transactional(f)
+ return d.wdb.(*dbx.DB).Transactional(f)
}