From a2288ec90abec0d3a1889c2fc961a7d75c0eb7b5 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sun, 31 Mar 2024 00:00:34 +0100 Subject: [PATCH] v1.2.0: back: use gorm in code Signed-off-by: GnomeZworc --- cmd/main.go | 8 +++++++- config/db.sql | 6 ------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 0b34c72..9abbdc6 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -9,6 +9,7 @@ import ( echoSwagger "github.com/swaggo/echo-swagger" logins "gitlab.g3e.fr/h6n/users/internal" "gitlab.g3e.fr/h6n/users/lib" + "gorm.io/gorm" "database/sql" @@ -17,6 +18,7 @@ import ( ) var db *sql.DB = nil +var dbGor *gorm.DB = nil // Logout // @Tags auth @@ -49,6 +51,11 @@ func init_database() { connStr := "postgres://acc:totor@postgres:5432/accounts?sslmode=disable" + dbGor, err = logins.Init_database(connStr) + if err != nil { + fmt.Println(err) + } + db, err = sql.Open("postgres", connStr) if err != nil { fmt.Println(err) @@ -92,7 +99,6 @@ func skip_log(c echo.Context) bool { // @description Enter the token with the `Bearer: ` prefix, e.g. "Bearer abcde12345". func main() { init_database() - logins.Init_database() if err := lib.InitLoginBiscuit(); err != nil { fmt.Println("error : ", err) return diff --git a/config/db.sql b/config/db.sql index 591d4d8..9357a40 100644 --- a/config/db.sql +++ b/config/db.sql @@ -1,7 +1 @@ -CREATE TABLE users ( - username TEXT PRIMARY KEY, - email TEXT UNIQUE NOT NULL, - password TEXT NOT NULL -); - INSERT INTO users(username, email, password) VALUES('0000000023', 'root@root.fr', '$2a$14$FU8FKR7pUq4akLThraD9kOu0zY0BuUFASo0xakgWEWbYF2gz20DuG'); \ No newline at end of file