From fc8589efaac146ca316a2a6d7daca92c2e5b1378 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 31 Mar 2022 10:12:50 +0200 Subject: [PATCH] Store config cleanup --- store/adapters/rdbms/config.go | 7 ------- store/adapters/rdbms/drivers/mysql/connect.go | 8 +------- store/adapters/rdbms/drivers/postgres/connect.go | 8 -------- store/adapters/rdbms/drivers/sqlite/connect.go | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/store/adapters/rdbms/config.go b/store/adapters/rdbms/config.go index f52f705ea..4eb0abb5c 100644 --- a/store/adapters/rdbms/config.go +++ b/store/adapters/rdbms/config.go @@ -32,9 +32,6 @@ type ( Dialect goqu.DialectWrapper - // Forces debug mode on RDBMS driver - Debug bool - // MaxOpenConns sets maximum number of open connections to the database // defaults to same value as set in the db/sql MaxOpenConns int @@ -96,10 +93,6 @@ func (c *Config) MaskedDSN() string { } func (c *Config) SetDefaults() { - //if c.PlaceholderFormat == nil { - // c.PlaceholderFormat = squirrel.Question - //} - if c.TxMaxRetries == 0 { c.TxMaxRetries = TxRetryHardLimit } diff --git a/store/adapters/rdbms/drivers/mysql/connect.go b/store/adapters/rdbms/drivers/mysql/connect.go index 810f659ae..1aa83ec5e 100644 --- a/store/adapters/rdbms/drivers/mysql/connect.go +++ b/store/adapters/rdbms/drivers/mysql/connect.go @@ -31,24 +31,18 @@ func Connect(ctx context.Context, dsn string) (_ store.Storer, err error) { return } - //cfg.PlaceholderFormat = squirrel.Question cfg.TxRetryErrHandler = txRetryErrHandler cfg.ErrorHandler = errorHandler - //cfg.UpsertBuilder = UpsertBuilder - //cfg.CastModuleFieldToColumnType = fieldToColumnTypeCaster - //cfg.SqlSortHandler = SqlSortHandler if s, err = rdbms.Connect(ctx, cfg); err != nil { return } - // See https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_ansi - // for details + // See https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_ansi for details if _, err = s.DB().ExecContext(ctx, "SET SESSION sql_mode = 'ANSI'"); err != nil { return } - //ql.QueryEncoder = &QueryEncoder{} cfg.Upgrader = NewUpgrader(s) return s, nil diff --git a/store/adapters/rdbms/drivers/postgres/connect.go b/store/adapters/rdbms/drivers/postgres/connect.go index a6f48a739..a577d6977 100644 --- a/store/adapters/rdbms/drivers/postgres/connect.go +++ b/store/adapters/rdbms/drivers/postgres/connect.go @@ -30,21 +30,13 @@ func Connect(ctx context.Context, dsn string) (_ store.Storer, err error) { return } - //cfg.PlaceholderFormat = squirrel.Dollar cfg.ErrorHandler = errorHandler - //cfg.SqlFunctionHandler = sqlFunctionHandler - //cfg.ASTFormatter = sqlASTFormatter - //cfg.CastModuleFieldToColumnType = fieldToColumnTypeCaster if s, err = rdbms.Connect(ctx, cfg); err != nil { return } - // s.Filters cfg.Upgrader = NewUpgrader(s) - - //ql.QueryEncoder = &QueryEncoder{} - return s, nil } diff --git a/store/adapters/rdbms/drivers/sqlite/connect.go b/store/adapters/rdbms/drivers/sqlite/connect.go index a4608840a..dd6953db4 100644 --- a/store/adapters/rdbms/drivers/sqlite/connect.go +++ b/store/adapters/rdbms/drivers/sqlite/connect.go @@ -29,16 +29,12 @@ func Connect(ctx context.Context, dsn string) (_ store.Storer, err error) { return } - //cfg.PlaceholderFormat = squirrel.Dollar cfg.TxRetryErrHandler = txRetryErrHandler cfg.ErrorHandler = errorHandler // Using transactions in SQLite causes table locking // @todo there must be a better way to go around this cfg.TxDisabled = true - //cfg.SqlFunctionHandler = sqlFunctionHandler - //cfg.ASTFormatter = sqlASTFormatter - //cfg.CastModuleFieldToColumnType = fieldToColumnTypeCaster // Set to zero // Otherwise SQLite (in-memory) disconnects @@ -51,8 +47,6 @@ func Connect(ctx context.Context, dsn string) (_ store.Storer, err error) { cfg.Upgrader = NewUpgrader(s) - //ql.QueryEncoder = &QueryEncoder{} - return s, nil }