updates places to use consts for postgres

nucleuscloud · Dec 2, 2024 · dade253 · dade253
1 parent 7322017
commit dade253
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/backend/pkg/sqlconnect/sql-connector.go b/backend/pkg/sqlconnect/sql-connector.go
@@ -14,6 +14,7 @@ import (
 	mgmtv1alpha1 "github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1"
 	"github.com/nucleuscloud/neosync/backend/pkg/clienttls"
 	dbconnectconfig "github.com/nucleuscloud/neosync/backend/pkg/dbconnect-config"
+	sqlmanager_shared "github.com/nucleuscloud/neosync/backend/pkg/sqlmanager/shared"
 	tun "github.com/nucleuscloud/neosync/internal/sshtunnel"
 	"github.com/nucleuscloud/neosync/internal/sshtunnel/connectors/mssqltunconnector"
 	"github.com/nucleuscloud/neosync/internal/sshtunnel/connectors/mysqltunconnector"
@@ -53,7 +54,7 @@ func WithMysqlParseTimeDisabled() SqlConnectorOption {
 // WithPostgresDriver overrides default postgres driver
 func WithDefaultPostgresDriver() SqlConnectorOption {
 	return func(opts *sqlConnectorOptions) {
-		opts.postgresDriver = "postgres"
+		opts.postgresDriver = sqlmanager_shared.DefaultPostgresDriver
 	}
 }
 
@@ -77,7 +78,7 @@ func (rc *SqlOpenConnector) NewDbFromConnectionConfig(cc *mgmtv1alpha1.Connectio
 	}
 
 	options := sqlConnectorOptions{
-		postgresDriver: "pgx",
+		postgresDriver: sqlmanager_shared.PostgresDriver,
 	}
 	for _, opt := range opts {
 		if opt != nil {

diff --git a/backend/pkg/sqlmanager/postgres/postgres-manager.go b/backend/pkg/sqlmanager/postgres/postgres-manager.go
@@ -853,7 +853,7 @@ func (p *PostgresManager) GetTableRowCount(
 	whereClause *string,
 ) (int64, error) {
 	tableName := sqlmanager_shared.BuildTable(schema, table)
-	builder := goqu.Dialect(sqlmanager_shared.PostgresDriver)
+	builder := getGoquDialect()
 	sqltable := goqu.I(tableName)
 
 	query := builder.From(sqltable).Select(goqu.COUNT("*"))
@@ -873,7 +873,7 @@ func (p *PostgresManager) GetTableRowCount(
 }
 
 func getGoquDialect() goqu.DialectWrapper {
-	return goqu.Dialect("postgres")
+	return goqu.Dialect(sqlmanager_shared.DefaultPostgresDriver)
 }
 
 func BuildPgTruncateStatement(

diff --git a/backend/pkg/sqlmanager/shared/types.go b/backend/pkg/sqlmanager/shared/types.go
@@ -99,9 +99,10 @@ func ToConstraintType(constraintType string) (ConstraintType, error) {
 }
 
 const (
-	PostgresDriver = "pgx"
-	MysqlDriver    = "mysql"
-	MssqlDriver    = "sqlserver"
+	PostgresDriver        = "pgx"
+	DefaultPostgresDriver = "postgres"
+	MysqlDriver           = "mysql"
+	MssqlDriver           = "sqlserver"
 )
 
 type BatchExecOpts struct {

diff --git a/backend/pkg/sqlmanager/sql-manager.go b/backend/pkg/sqlmanager/sql-manager.go
@@ -138,7 +138,7 @@ func (s *SqlManager) NewSqlConnection(
 
 func GetColumnOverrideAndResetProperties(driver string, cInfo *sqlmanager_shared.DatabaseSchemaRow) (needsOverride, needsReset bool, err error) {
 	switch driver {
-	case sqlmanager_shared.PostgresDriver, "postgres":
+	case sqlmanager_shared.PostgresDriver, sqlmanager_shared.DefaultPostgresDriver:
 		needsOverride, needsReset := sqlmanager_postgres.GetPostgresColumnOverrideAndResetProperties(cInfo)
 		return needsOverride, needsReset, nil
 	case sqlmanager_shared.MysqlDriver:

diff --git a/backend/services/mgmt/v1alpha1/connection-data-service/connection-data.go b/backend/services/mgmt/v1alpha1/connection-data-service/connection-data.go
@@ -162,7 +162,7 @@ func (s *Service) GetConnectionDataStream(
 
 		table := sqlmanager_shared.BuildTable(req.Msg.Schema, req.Msg.Table)
 		// used to get column names
-		query, err := querybuilder.BuildSelectLimitQuery("postgres", table, 1)
+		query, err := querybuilder.BuildSelectLimitQuery(sqlmanager_shared.DefaultPostgresDriver, table, 1)
 		if err != nil {
 			return err
 		}
@@ -177,7 +177,7 @@ func (s *Service) GetConnectionDataStream(
 			return err
 		}
 
-		selectQuery, err := querybuilder.BuildSelectQuery("postgres", table, columnNames, nil)
+		selectQuery, err := querybuilder.BuildSelectQuery(sqlmanager_shared.DefaultPostgresDriver, table, columnNames, nil)
 		if err != nil {
 			return err
 		}

diff --git a/internal/benthos/benthos-builder/builders/sql-util.go b/internal/benthos/benthos-builder/builders/sql-util.go
@@ -732,7 +732,7 @@ func getAdditionalJobMappings(
 					})
 				} else {
 					switch driver {
-					case "postgres":
+					case sqlmanager_shared.DefaultPostgresDriver, sqlmanager_shared.PostgresDriver:
 						transformer, err := getJmTransformerByPostgresDataType(info)
 						if err != nil {
 							return nil, err

diff --git a/worker/pkg/query-builder/insert-query-builder.go b/worker/pkg/query-builder/insert-query-builder.go
@@ -33,7 +33,7 @@ func GetInsertBuilder(
 	}
 
 	switch driver {
-	case sqlmanager_shared.PostgresDriver, "postgres":
+	case sqlmanager_shared.PostgresDriver, sqlmanager_shared.DefaultPostgresDriver:
 		return &PostgresDriver{
 			driver:  driver,
 			logger:  logger,

diff --git a/worker/pkg/query-builder/query-builder.go b/worker/pkg/query-builder/query-builder.go
@@ -28,7 +28,7 @@ type SubsetColumnConstraint struct {
 
 func getGoquDialect(driver string) goqu.DialectWrapper {
 	if driver == sqlmanager_shared.PostgresDriver {
-		return goqu.Dialect("postgres")
+		return goqu.Dialect(sqlmanager_shared.DefaultPostgresDriver)
 	}
 	return goqu.Dialect(driver)
 }