support PostgreSQL

go-shiori · Jul 17, 2023 · e950ff4 · e950ff4
1 parent b872736
commit e950ff4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/internal/database/migrations/postgres/0001_initial.up.sql b/internal/database/migrations/postgres/0001_initial.up.sql
@@ -3,6 +3,7 @@ CREATE TABLE IF NOT EXISTS account(
 		username VARCHAR(250) NOT NULL,
 		password BYTEA    NOT NULL,
 		owner    BOOLEAN  NOT NULL DEFAULT FALSE,
+		configures VARCHAR(500) NOT NULL,
 		PRIMARY KEY (id),
 		CONSTRAINT account_username_UNIQUE UNIQUE (username));
 
@@ -33,4 +34,4 @@ CREATE TABLE IF NOT EXISTS bookmark_tag(
 		CONSTRAINT bookmark_tag_tag_id_FK FOREIGN KEY (tag_id) REFERENCES tag (id));
 
 CREATE INDEX IF NOT EXISTS bookmark_tag_bookmark_id_FK ON bookmark_tag (bookmark_id);
-CREATE INDEX IF NOT EXISTS bookmark_tag_tag_id_FK ON bookmark_tag (tag_id);
+CREATE INDEX IF NOT EXISTS bookmark_tag_tag_id_FK ON bookmark_tag (tag_id);
diff --git a/internal/database/mysql.go b/internal/database/mysql.go
@@ -541,7 +541,7 @@ func (db *MySQLDatabase) SaveAccount(ctx context.Context, account model.Account)
 	return errors.WithStack(err)
 }
 
-// SaveAccount saves new account to database. Returns error if any happened.
+// SaveSettings update settings for specific account  in database. Returns error if any happened
 func (db *MySQLDatabase) SaveSettings(ctx context.Context, account model.Account) (err error) {
 	err = IsJson(account.Configures)
 	if err != nil {

diff --git a/internal/database/pg.go b/internal/database/pg.go
@@ -542,11 +542,27 @@ func (db *PGDatabase) SaveAccount(ctx context.Context, account model.Account) (e
 
 	// Insert account to database
 	_, err = db.ExecContext(ctx, `INSERT INTO account
-		(username, password, owner) VALUES ($1, $2, $3)
+		(username, password, owner, configures) VALUES ($1, $2, $3, $4)
 		ON CONFLICT(username) DO UPDATE SET
 		password = $2,
 		owner = $3`,
-		account.Username, hashedPassword, account.Owner)
+		account.Username, hashedPassword, account.Owner, account.Configures)
+
+	return errors.WithStack(err)
+}
+
+// SaveSettings update settings for specific account  in database. Returns error if any happened
+func (db *PGDatabase) SaveSettings(ctx context.Context, account model.Account) (err error) {
+	err = IsJson(account.Configures)
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	// Insert account to database
+	_, err = db.ExecContext(ctx, `UPDATE account
+   		SET configures = $1
+   		WHERE username = $2`,
+		account.Configures, account.Username)
 
 	return errors.WithStack(err)
 }
@@ -555,7 +571,7 @@ func (db *PGDatabase) SaveAccount(ctx context.Context, account model.Account) (e
 func (db *PGDatabase) GetAccounts(ctx context.Context, opts GetAccountsOptions) ([]model.Account, error) {
 	// Create query
 	args := []interface{}{}
-	query := `SELECT id, username, owner FROM account WHERE TRUE`
+	query := `SELECT id, username, owner, configures FROM account WHERE TRUE`
 
 	if opts.Keyword != "" {
 		query += " AND username LIKE $1"
@@ -583,7 +599,7 @@ func (db *PGDatabase) GetAccounts(ctx context.Context, opts GetAccountsOptions)
 func (db *PGDatabase) GetAccount(ctx context.Context, username string) (model.Account, bool, error) {
 	account := model.Account{}
 	if err := db.GetContext(ctx, &account, `SELECT
-		id, username, password, owner FROM account WHERE username = $1`,
+		id, username, password, owner, configures FROM account WHERE username = $1`,
 		username,
 	); err != nil {
 		return account, false, errors.WithStack(err)