Skip to content

Commit

Permalink
feat: Update migration code to support table names (#339)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fusion committed Oct 2, 2023
1 parent 15ed058 commit 349431c
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions v2/pkg/plugins/basesqlhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type SqlBackend interface {
// Create db/schema if necessary
CreateSchema(db *sql.DB)
// Migrate schema if necessary
MigrateSchema(db *sql.DB, checker func(*sql.DB, string) bool)
MigrateSchema(db *sql.DB, checker func(*sql.DB, string, string) bool)
//
GetPrepareSymbol() string
}
Expand Down Expand Up @@ -88,14 +88,11 @@ func NewDatabaseHandler(sqlBackend SqlBackend, opts ...handler.Option) handler.H
return handler
}

func ColumnExists(db *sql.DB, columnName string) bool {
func ColumnExists(db *sql.DB, tableName string, columnName string) bool {
var found string
err := db.QueryRow(fmt.Sprintf(`SELECT COUNT(%s) FROM users`, columnName)).Scan(
err := db.QueryRow(fmt.Sprintf(`SELECT COUNT(%s) FROM %s`, columnName, tableName)).Scan(
&found)
if err != nil {
return false
}
return true
return err == nil
}

func (h databaseHandler) GetBackend() config.Backend {
Expand Down Expand Up @@ -313,8 +310,8 @@ func (h databaseHandler) commaListToStringTable(commaList string) []string {
func (h databaseHandler) memoizeGroups() ([]config.Group, error) {
workMemGroups := make([]*config.Group, 0)
rows, err := h.database.cnx.Query(`
SELECT g1.name,g1.gidnumber,ig.includegroupid
FROM ldapgroups g1
SELECT g1.name,g1.gidnumber,ig.includegroupid
FROM ldapgroups g1
LEFT JOIN includegroups ig ON g1.gidnumber=ig.parentgroupid
LEFT JOIN ldapgroups g2 ON ig.includegroupid=g2.gidnumber`)
if err != nil {
Expand Down

0 comments on commit 349431c

Please sign in to comment.