From a9f70cfe388cccf6f74de98ef4250cc6ba1d65f0 Mon Sep 17 00:00:00 2001 From: Jake Hobbs Date: Thu, 18 Jan 2024 22:45:06 -0800 Subject: [PATCH] don't create db --- service/db.go | 79 ++++++++++++++++++++++++------------------------- service/main.go | 2 +- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/service/db.go b/service/db.go index 52dfbb2..bf37bff 100644 --- a/service/db.go +++ b/service/db.go @@ -1,58 +1,57 @@ package main import ( - "fmt" "github.com/dxe/helptheducks.com/service/config" "github.com/jmoiron/sqlx" "log" - "strings" ) -func mustGetOrCreateDb() *sqlx.DB { - dsn, dbName := splitDbNameFromDsn(config.Dsn) - - db, err := sqlx.Open("mysql", dsn) - if err != nil { - log.Fatalf("Error connecting to database: %v", err) - } - fmt.Println("Connected to database") - - // Create the database if it doesn't exist. - query := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", dbName) - _, err = db.Exec(query) - if err != nil { - log.Fatalf("Error creating database: %v", err) - } +// TODO: make a separate script to init db b/c this is kinda sketch for prod. +func getDb() *sqlx.DB { + //dsn, dbName := splitDbNameFromDsn(config.Dsn) + // + //db, err := sqlx.Open("mysql", dsn) + //if err != nil { + // log.Fatalf("Error connecting to database: %v", err) + //} + //fmt.Println("Connected to database") + // + //// Create the database if it doesn't exist. + //query := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", dbName) + //_, err = db.Exec(query) + //if err != nil { + // log.Fatalf("Error creating database: %v", err) + //} // Connect to the specific database. - db, err = sqlx.Open("mysql", config.Dsn) + db, err := sqlx.Open("mysql", config.Dsn) if err != nil { log.Fatalf("Error connecting to specified database: %v", err) } - createTableQuery := ` - CREATE TABLE IF NOT EXISTS messages ( - id INT AUTO_INCREMENT PRIMARY KEY, - submitted_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - ip_address VARCHAR(255), - name VARCHAR(255) NOT NULL, - email VARCHAR(255) NOT NULL, - phone VARCHAR(255), - outside_us BOOLEAN NOT NULL DEFAULT FALSE, - zip VARCHAR(5), - city VARCHAR(255), - message TEXT, - status VARCHAR(20) NOT NULL DEFAULT 'PENDING' - )` - _, err = db.Exec(createTableQuery) - if err != nil { - log.Fatalf("Error creating messages table: %v", err) - } + //createTableQuery := ` + // CREATE TABLE IF NOT EXISTS messages ( + // id INT AUTO_INCREMENT PRIMARY KEY, + // submitted_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + // ip_address VARCHAR(255), + // name VARCHAR(255) NOT NULL, + // email VARCHAR(255) NOT NULL, + // phone VARCHAR(255), + // outside_us BOOLEAN NOT NULL DEFAULT FALSE, + // zip VARCHAR(5), + // city VARCHAR(255), + // message TEXT, + // status VARCHAR(20) NOT NULL DEFAULT 'PENDING' + // )` + //_, err = db.Exec(createTableQuery) + //if err != nil { + // log.Fatalf("Error creating messages table: %v", err) + //} return db } -func splitDbNameFromDsn(dsn string) (string, string) { - parts := strings.Split(dsn, "/") - return strings.Join(parts[:len(parts)-1], "/") + "/", parts[len(parts)-1] -} +//func splitDbNameFromDsn(dsn string) (string, string) { +// parts := strings.Split(dsn, "/") +// return strings.Join(parts[:len(parts)-1], "/") + "/", parts[len(parts)-1] +//} diff --git a/service/main.go b/service/main.go index 8ed94c1..6ebf6d4 100644 --- a/service/main.go +++ b/service/main.go @@ -37,7 +37,7 @@ func main() { MaxAge: 300, // Maximum value not ignored by any of major browsers. })) - db = mustGetOrCreateDb() + db = getDb() defer db.Close() r.Route("/message", func(r chi.Router) {