Compare commits

..

2 Commits

3 changed files with 54 additions and 23 deletions

View File

@ -36,38 +36,64 @@ func Migrate(app *app.App, anyStruct interface{}) error {
// createTable creates a table with the given name if it doesn't exist, it is assumed that id will be the primary key // createTable creates a table with the given name if it doesn't exist, it is assumed that id will be the primary key
func createTable(app *app.App, tableName string) error { func createTable(app *app.App, tableName string) error {
sanitizedTableQuery := fmt.Sprintf("CREATE TABLE IF NOT EXISTS \"%s\" (\"Id\" serial primary key)", tableName) // Check to see if the table already exists
var tableExists bool
_, err := app.Db.Query(sanitizedTableQuery) err := app.Db.QueryRow("SELECT EXISTS (SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace WHERE c.relname ~ $1 AND pg_catalog.pg_table_is_visible(c.oid))", "^"+tableName+"$").Scan(&tableExists)
if err != nil { if err != nil {
log.Println("Error creating table: " + tableName) log.Println("Error checking if table exists: " + tableName)
return err return err
} }
log.Println("Table created successfully (or already exists): " + tableName) if tableExists {
return nil log.Println("Table already exists: " + tableName)
return nil
} else {
sanitizedTableQuery := fmt.Sprintf("CREATE TABLE IF NOT EXISTS \"%s\" (\"Id\" serial primary key)", tableName)
_, err := app.Db.Query(sanitizedTableQuery)
if err != nil {
log.Println("Error creating table: " + tableName)
return err
}
log.Println("Table created successfully: " + tableName)
return nil
}
} }
// createColumn creates a column with the given name and type if it doesn't exist // createColumn creates a column with the given name and type if it doesn't exist
func createColumn(app *app.App, tableName, columnName, columnType string) error { func createColumn(app *app.App, tableName, columnName, columnType string) error {
postgresType, err := getPostgresType(columnType) // Check to see if the column already exists
var columnExists bool
err := app.Db.QueryRow("SELECT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = $1 AND column_name = $2)", tableName, columnName).Scan(&columnExists)
if err != nil { if err != nil {
log.Println("Error creating column: " + columnName + " in table: " + tableName + " with type: " + postgresType) log.Println("Error checking if column exists: " + columnName + " in table: " + tableName)
return err return err
} }
sanitizedTableName := pq.QuoteIdentifier(tableName) if columnExists {
query := fmt.Sprintf("ALTER TABLE %s ADD COLUMN IF NOT EXISTS \"%s\" %s", sanitizedTableName, columnName, postgresType) log.Println("Column already exists: " + columnName + " in table: " + tableName)
return nil
} else {
postgresType, err := getPostgresType(columnType)
if err != nil {
log.Println("Error creating column: " + columnName + " in table: " + tableName + " with type: " + postgresType)
return err
}
_, err = app.Db.Query(query) sanitizedTableName := pq.QuoteIdentifier(tableName)
if err != nil { query := fmt.Sprintf("ALTER TABLE %s ADD COLUMN IF NOT EXISTS \"%s\" %s", sanitizedTableName, columnName, postgresType)
log.Println("Error creating column: " + columnName + " in table: " + tableName + " with type: " + postgresType)
return err _, err = app.Db.Query(query)
if err != nil {
log.Println("Error creating column: " + columnName + " in table: " + tableName + " with type: " + postgresType)
return err
}
log.Println("Column created successfully:", columnName)
return nil
} }
log.Println("Column created successfully (or already exists):", columnName)
return nil
} }
// Given a type in Go, return the corresponding type in Postgres // Given a type in Go, return the corresponding type in Postgres

View File

@ -3,6 +3,7 @@ package models
import ( import (
"GoWeb/app" "GoWeb/app"
"GoWeb/database" "GoWeb/database"
"time"
) )
// RunAllMigrations defines the structs that should be represented in the database // RunAllMigrations defines the structs that should be represented in the database
@ -13,9 +14,13 @@ func RunAllMigrations(app *app.App) error {
Username: "migrate", Username: "migrate",
Password: "migrate", Password: "migrate",
AuthToken: "migrate", AuthToken: "migrate",
CreatedAt: "2021-01-01 00:00:00", CreatedAt: time.Now(),
UpdatedAt: "2021-01-01 00:00:00", UpdatedAt: time.Now(),
}
err := database.Migrate(app, user)
if err != nil {
return err
} }
return database.Migrate(app, user) return nil
} }

View File

@ -19,8 +19,8 @@ type User struct {
Username string Username string
Password string Password string
AuthToken string AuthToken string
CreatedAt string CreatedAt time.Time
UpdatedAt string UpdatedAt time.Time
} }
// GetCurrentUser finds the currently logged-in user by session cookie // GetCurrentUser finds the currently logged-in user by session cookie