From 68792219961cf3be195712f67e3389df3cb60e83 Mon Sep 17 00:00:00 2001 From: kirby Date: Mon, 18 Mar 2024 15:54:01 +0100 Subject: [PATCH] Improve database connection --- .env.example | 8 ++++---- Database/utils.go | 20 +++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.env.example b/.env.example index 7f58942..40248b5 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -DATABASE_HOST= -DATABASE_USER= -DATABASE_PASSWORD= -DATABASE_NAME= +DATABASE_HOST="127.0.0.1:3306" +DATABASE_USER="test" +DATABASE_PASSWORD="test" +DATABASE_NAME="test" diff --git a/Database/utils.go b/Database/utils.go index 2c36e16..df82707 100644 --- a/Database/utils.go +++ b/Database/utils.go @@ -2,24 +2,22 @@ package database import ( "database/sql" - "fmt" "log" "os" + "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql" ) -func dsn() string { - user := os.Getenv("DATABASE_USER") - password := os.Getenv("DATABASE_PASSWORD") - host := os.Getenv("DATABASE_HOST") - port := os.Getenv("DATABASE_PORT") - name := os.Getenv("DATABASE_NAME") - return fmt.Sprintf("%s:%s@tcp(%s:%s)/%s", user, password, host, port, name) -} - func GetDatabaseConnection() *sql.DB { - DB_conn, err := sql.Open("mysql", dsn()) + cfg := mysql.Config{ + User: os.Getenv("DATABASE_USER"), + Passwd: os.Getenv("DATABASE_PASSWORD"), + Net: "tcp", + Addr: os.Getenv("DATABASE_HOST"), + DBName: os.Getenv("DATABASE_NAME"), + } + DB_conn, err := sql.Open("mysql", cfg.FormatDSN()) if err != nil { log.Println("Database connection error : ", err) }