Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
fix: mysql syntax
Steven553de3cc7e37
diff --git a/store/db/mysql/activity.go b/store/db/mysql/activity.goindex a02177ea0..ab55232e4 100644--- a/store/db/mysql/activity.go+++ b/store/db/mysql/activity.go@@ -9,15 +9,7 @@ import ()func (d *DB) CreateActivity(ctx context.Context, create *store.Activity) (*store.Activity, error) {- stmt := `- INSERT INTO activity (- creator_id,- type,- level,- payload- )- VALUES (?, ?, ?, ?)- `+ stmt := "INSERT INTO activity (`creator_id`, `type`, `level`, `payload`) VALUES (?, ?, ?, ?)"result, err := d.db.ExecContext(ctx, stmt,create.CreatorID,create.Type,@@ -25,12 +17,12 @@ func (d *DB) CreateActivity(ctx context.Context, create *store.Activity) (*storecreate.Payload,)if err != nil {- return nil, errors.Wrap(err, "failed to db.Exec")+ return nil, errors.Wrap(err, "failed to execute statement")}id, err := result.LastInsertId()if err != nil {- return nil, errors.Wrap(err, "failed to db.LastInsertId")+ return nil, errors.Wrap(err, "failed to get last insert id")}return d.FindActivity(ctx, id)@@ -38,17 +30,7 @@ func (d *DB) CreateActivity(ctx context.Context, create *store.Activity) (*storefunc (d *DB) FindActivity(ctx context.Context, id int64) (*store.Activity, error) {var activity store.Activity- stmt := `- SELECT- id,- creator_id,- type,- level,- payload,- UNIX_TIMESTAMP(created_ts)- FROM activity- WHERE id = ?- `+ stmt := "SELECT `id`, `creator_id`, `type`, `level`, `payload`, UNIX_TIMESTAMP(`created_ts`) FROM `activity` WHERE `id` = ?"if err := d.db.QueryRowContext(ctx, stmt, id).Scan(&activity.ID,&activity.CreatorID,diff --git a/store/db/mysql/idp.go b/store/db/mysql/idp.goindex ee4dface5..8f84df292 100644--- a/store/db/mysql/idp.go+++ b/store/db/mysql/idp.go@@ -22,15 +22,7 @@ func (d *DB) CreateIdentityProvider(ctx context.Context, create *store.IdentityPreturn nil, errors.Errorf("unsupported idp type %s", string(create.Type))}- stmt := `- INSERT INTO idp (- name,- type,- identifier_filter,- config- )- VALUES (?, ?, ?, ?)- `+ stmt := "INSERT INTO `idp` (`name`, `type`, `identifier_filter`, `config`) VALUES (?, ?, ?, ?)"result, err := d.db.ExecContext(ctx,stmt,@@ -55,18 +47,10 @@ func (d *DB) CreateIdentityProvider(ctx context.Context, create *store.IdentityPfunc (d *DB) ListIdentityProviders(ctx context.Context, find *store.FindIdentityProvider) ([]*store.IdentityProvider, error) {where, args := []string{"1 = 1"}, []any{}if v := find.ID; v != nil {- where, args = append(where, "id = ?"), append(args, *v)- }-- rows, err := d.db.QueryContext(ctx, `- SELECT- id,- name,- type,- identifier_filter,- config- FROM idp- WHERE `+strings.Join(where, " AND ")+` ORDER BY id ASC`,+ where, args = append(where, "`id` = ?"), append(args, *v)+ }++ rows, err := d.db.QueryContext(ctx, "SELECT `id`, `name`, `type`, `identifier_filter`, `config` FROM `idp` WHERE "+strings.Join(where, " AND ")+" ORDER BY `id` ASC",args...,)if err != nil {@@ -125,10 +109,10 @@ func (d *DB) GetIdentityProvider(ctx context.Context, find *store.FindIdentityPrfunc (d *DB) UpdateIdentityProvider(ctx context.Context, update *store.UpdateIdentityProvider) (*store.IdentityProvider, error) {set, args := []string{}, []any{}if v := update.Name; v != nil {- set, args = append(set, "name = ?"), append(args, *v)+ set, args = append(set, "`name` = ?"), append(args, *v)}if v := update.IdentifierFilter; v != nil {- set, args = append(set, "identifier_filter = ?"), append(args, *v)+ set, args = append(set, "`identifier_filter` = ?"), append(args, *v)}if v := update.Config; v != nil {var configBytes []byte@@ -141,15 +125,11 @@ func (d *DB) UpdateIdentityProvider(ctx context.Context, update *store.UpdateIde} else {return nil, errors.Errorf("unsupported idp type %s", string(update.Type))}- set, args = append(set, "config = ?"), append(args, string(configBytes))+ set, args = append(set, "`config` = ?"), append(args, string(configBytes))}args = append(args, update.ID)- stmt := `- UPDATE idp- SET ` + strings.Join(set, ", ") + `- WHERE id = ?- `+ stmt := "UPDATE `idp` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"_, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return nil, err@@ -168,8 +148,8 @@ func (d *DB) UpdateIdentityProvider(ctx context.Context, update *store.UpdateIde}func (d *DB) DeleteIdentityProvider(ctx context.Context, delete *store.DeleteIdentityProvider) error {- where, args := []string{"id = ?"}, []any{delete.ID}- stmt := `DELETE FROM idp WHERE ` + strings.Join(where, " AND ")+ where, args := []string{"`id` = ?"}, []any{delete.ID}+ stmt := "DELETE FROM `idp` WHERE " + strings.Join(where, " AND ")result, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return errdiff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.goindex fa93c61f1..29d2c6766 100644--- a/store/db/mysql/memo.go+++ b/store/db/mysql/memo.go@@ -13,14 +13,7 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- stmt := `- INSERT INTO memo (- creator_id,- content,- visibility- )- VALUES (?, ?, ?)- `+ stmt := "INSERT INTO `memo` (`creator_id`, `content`, `visibility`) VALUES (?, ?, ?)"result, err := d.db.ExecContext(ctx,stmt,@@ -51,26 +44,26 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memowhere, args := []string{"1 = 1"}, []any{}if v := find.ID; v != nil {- where, args = append(where, "memo.id = ?"), append(args, *v)+ where, args = append(where, "`memo`.`id` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {- where, args = append(where, "memo.creator_id = ?"), append(args, *v)+ where, args = append(where, "`memo`.`creator_id` = ?"), append(args, *v)}if v := find.RowStatus; v != nil {- where, args = append(where, "memo.row_status = ?"), append(args, *v)+ where, args = append(where, "`memo`.`row_status` = ?"), append(args, *v)}if v := find.CreatedTsBefore; v != nil {- where, args = append(where, "UNIX_TIMESTAMP(memo.created_ts) < ?"), append(args, *v)+ where, args = append(where, "UNIX_TIMESTAMP(`memo`.`created_ts`) < ?"), append(args, *v)}if v := find.CreatedTsAfter; v != nil {- where, args = append(where, "UNIX_TIMESTAMP(memo.created_ts) > ?"), append(args, *v)+ where, args = append(where, "UNIX_TIMESTAMP(`memo`.`created_ts`) > ?"), append(args, *v)}if v := find.Pinned; v != nil {- where = append(where, "memo_organizer.pinned = 1")+ where = append(where, "`memo_organizer`.`pinned` = 1")}if v := find.ContentSearch; len(v) != 0 {for _, s := range v {- where, args = append(where, "memo.content LIKE ?"), append(args, "%"+s+"%")+ where, args = append(where, "`memo`.`content` LIKE ?"), append(args, "%"+s+"%")}}if v := find.VisibilityList; len(v) != 0 {@@ -79,45 +72,17 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memolist = append(list, "?")args = append(args, visibility)}- where = append(where, fmt.Sprintf("memo.visibility in (%s)", strings.Join(list, ",")))+ where = append(where, fmt.Sprintf("`memo`.`visibility` in (%s)", strings.Join(list, ",")))}- orders := []string{"pinned DESC"}+ orders := []string{"`pinned` DESC"}if find.OrderByUpdatedTs {- orders = append(orders, "updated_ts DESC")+ orders = append(orders, "`updated_ts` DESC")} else {- orders = append(orders, "created_ts DESC")+ orders = append(orders, "`created_ts` DESC")}- orders = append(orders, "id DESC")+ orders = append(orders, "`id` DESC")- query := `- SELECT- memo.id AS id,- memo.creator_id AS creator_id,- UNIX_TIMESTAMP(memo.created_ts) AS created_ts,- UNIX_TIMESTAMP(memo.updated_ts) AS updated_ts,- memo.row_status AS row_status,- memo.content AS content,- memo.visibility AS visibility,- MAX(CASE WHEN memo_organizer.pinned = 1 THEN 1 ELSE 0 END) AS pinned,- GROUP_CONCAT(resource.id) AS resource_id_list,- (- SELECT- GROUP_CONCAT(memo_id,':',related_memo_id,':',type)- FROM- memo_relation- WHERE- memo_relation.memo_id = memo.id OR memo_relation.related_memo_id = memo.id- ) AS relation_list- FROM- memo- LEFT JOIN- memo_organizer ON memo.id = memo_organizer.memo_id- LEFT JOIN- resource ON memo.id = resource.memo_id- WHERE ` + strings.Join(where, " AND ") + `- GROUP BY memo.id- ORDER BY ` + strings.Join(orders, ", ") + `- `+ query := "SELECT `memo`.`id` AS `id`, `memo`.`creator_id` AS `creator_id`, UNIX_TIMESTAMP(`memo`.`created_ts`) AS `created_ts`, UNIX_TIMESTAMP(`memo`.`updated_ts`) AS `updated_ts`, `memo`.`row_status` AS `row_status`, `memo`.`content` AS `content`, `memo`.`visibility` AS `visibility`, MAX(CASE WHEN `memo_organizer`.`pinned` = 1 THEN 1 ELSE 0 END) AS `pinned`, GROUP_CONCAT(`resource`.`id`) AS `resource_id_list`, (SELECT GROUP_CONCAT(`memo_id`,':',`related_memo_id`,':',`type`) FROM `memo_relation` WHERE `memo_relation`.`memo_id` = `memo`.`id` OR `memo_relation`.`related_memo_id` = `memo`.`id` ) AS `relation_list` FROM `memo` LEFT JOIN `memo_organizer` ON `memo`.`id` = `memo_organizer`.`memo_id` LEFT JOIN `resource` ON `memo`.`id` = `resource`.`memo_id` WHERE " + strings.Join(where, " AND ") + " GROUP BY `memo`.`id` ORDER BY " + strings.Join(orders, ", ")if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {@@ -216,27 +181,23 @@ func (d *DB) GetMemo(ctx context.Context, find *store.FindMemo) (*store.Memo, erfunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}if v := update.CreatedTs; v != nil {- set, args = append(set, "created_ts = FROM_UNIXTIME(?)"), append(args, *v)+ set, args = append(set, "`created_ts` = FROM_UNIXTIME(?)"), append(args, *v)}if v := update.UpdatedTs; v != nil {- set, args = append(set, "updated_ts = FROM_UNIXTIME(?)"), append(args, *v)+ set, args = append(set, "`updated_ts` = FROM_UNIXTIME(?)"), append(args, *v)}if v := update.RowStatus; v != nil {- set, args = append(set, "row_status = ?"), append(args, *v)+ set, args = append(set, "`row_status` = ?"), append(args, *v)}if v := update.Content; v != nil {- set, args = append(set, "content = ?"), append(args, *v)+ set, args = append(set, "`content` = ?"), append(args, *v)}if v := update.Visibility; v != nil {- set, args = append(set, "visibility = ?"), append(args, *v)+ set, args = append(set, "`visibility` = ?"), append(args, *v)}args = append(args, update.ID)- stmt := `- UPDATE memo- SET ` + strings.Join(set, ", ") + `- WHERE id = ?- `+ stmt := "UPDATE `memo` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"if _, err := d.db.ExecContext(ctx, stmt, args...); err != nil {return err}@@ -244,8 +205,8 @@ func (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {}func (d *DB) DeleteMemo(ctx context.Context, delete *store.DeleteMemo) error {- where, args := []string{"id = ?"}, []any{delete.ID}- stmt := `DELETE FROM memo WHERE ` + strings.Join(where, " AND ")+ where, args := []string{"`id` = ?"}, []any{delete.ID}+ stmt := "DELETE FROM `memo` WHERE " + strings.Join(where, " AND ")result, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return err@@ -269,8 +230,8 @@ func (d *DB) FindMemosVisibilityList(ctx context.Context, memoIDs []int32) ([]stlist = append(list, "?")}- where := fmt.Sprintf("id in (%s)", strings.Join(list, ","))- query := `SELECT DISTINCT(visibility) FROM memo WHERE ` + where+ where := fmt.Sprintf("`id` in (%s)", strings.Join(list, ","))+ query := "SELECT DISTINCT(`visibility`) FROM `memo` WHERE " + whererows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -294,16 +255,7 @@ func (d *DB) FindMemosVisibilityList(ctx context.Context, memoIDs []int32) ([]st}func vacuumMemo(ctx context.Context, tx *sql.Tx) error {- stmt := `- DELETE FROM- memo- WHERE- creator_id NOT IN (- SELECT- id- FROM- user- )`+ stmt := "DELETE FROM `memo` WHERE `creator_id` NOT IN (SELECT `id` FROM `user`)"_, err := tx.ExecContext(ctx, stmt)if err != nil {return errdiff --git a/store/db/mysql/memo_organizer.go b/store/db/mysql/memo_organizer.goindex 600b68285..aeabb2ba3 100644--- a/store/db/mysql/memo_organizer.go+++ b/store/db/mysql/memo_organizer.go@@ -3,48 +3,31 @@ package mysqlimport ("context""database/sql"- "fmt""strings""github.com/usememos/memos/store")func (d *DB) UpsertMemoOrganizer(ctx context.Context, upsert *store.MemoOrganizer) (*store.MemoOrganizer, error) {- stmt := `- INSERT INTO memo_organizer (- memo_id,- user_id,- pinned- )- VALUES (?, ?, ?)- ON DUPLICATE KEY UPDATE pinned = ?- `+ stmt := "INSERT INTO `memo_organizer` (`memo_id`, `user_id`, `pinned`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `pinned` = ?"if _, err := d.db.ExecContext(ctx, stmt, upsert.MemoID, upsert.UserID, upsert.Pinned, upsert.Pinned); err != nil {return nil, err}-return upsert, nil}func (d *DB) GetMemoOrganizer(ctx context.Context, find *store.FindMemoOrganizer) (*store.MemoOrganizer, error) {where, args := []string{}, []any{}if find.MemoID != 0 {- where = append(where, "memo_id = ?")+ where = append(where, "`memo_id` = ?")args = append(args, find.MemoID)}if find.UserID != 0 {- where = append(where, "user_id = ?")+ where = append(where, "`user_id` = ?")args = append(args, find.UserID)}- query := fmt.Sprintf(`- SELECT- memo_id,- user_id,- pinned- FROM memo_organizer- WHERE %s- `, strings.Join(where, " AND "))+ query := "SELECT `memo_id`, `user_id`, `pinned` FROM `memo_organizer` WHERE " + strings.Join(where, " AND ")row := d.db.QueryRowContext(ctx, query, args...)if err := row.Err(); err != nil {return nil, err@@ -68,12 +51,12 @@ func (d *DB) GetMemoOrganizer(ctx context.Context, find *store.FindMemoOrganizerfunc (d *DB) DeleteMemoOrganizer(ctx context.Context, delete *store.DeleteMemoOrganizer) error {where, args := []string{}, []any{}if v := delete.MemoID; v != nil {- where, args = append(where, "memo_id = ?"), append(args, *v)+ where, args = append(where, "`memo_id` = ?"), append(args, *v)}if v := delete.UserID; v != nil {- where, args = append(where, "user_id = ?"), append(args, *v)+ where, args = append(where, "`user_id` = ?"), append(args, *v)}- stmt := `DELETE FROM memo_organizer WHERE ` + strings.Join(where, " AND ")+ stmt := "DELETE FROM `memo_organizer` WHERE " + strings.Join(where, " AND ")if _, err := d.db.ExecContext(ctx, stmt, args...); err != nil {return err}@@ -81,26 +64,10 @@ func (d *DB) DeleteMemoOrganizer(ctx context.Context, delete *store.DeleteMemoOr}func vacuumMemoOrganizer(ctx context.Context, tx *sql.Tx) error {- stmt := `- DELETE FROM- memo_organizer- WHERE- memo_id NOT IN (- SELECT- id- FROM- memo- )- OR user_id NOT IN (- SELECT- id- FROM- user- )`+ stmt := "DELETE FROM `memo_organizer` WHERE `memo_id` NOT IN (SELECT `id` FROM `memo`) OR `user_id` NOT IN (SELECT `id` FROM `user`)"_, err := tx.ExecContext(ctx, stmt)if err != nil {return err}-return nil}diff --git a/store/db/mysql/memo_relation.go b/store/db/mysql/memo_relation.goindex 861a95041..ce769e56d 100644--- a/store/db/mysql/memo_relation.go+++ b/store/db/mysql/memo_relation.go@@ -9,22 +9,13 @@ import ()func (d *DB) UpsertMemoRelation(ctx context.Context, create *store.MemoRelation) (*store.MemoRelation, error) {- stmt := `- INSERT INTO memo_relation (- memo_id,- related_memo_id,- type- )- VALUES (?, ?, ?)- ON DUPLICATE KEY UPDATE type = ?- `+ stmt := "INSERT INTO `memo_relation` (`memo_id`, `related_memo_id`, `type`) VALUES (?, ?, ?)"_, err := d.db.ExecContext(ctx,stmt,create.MemoID,create.RelatedMemoID,create.Type,- create.Type,)if err != nil {return nil, err@@ -42,22 +33,16 @@ func (d *DB) UpsertMemoRelation(ctx context.Context, create *store.MemoRelation)func (d *DB) ListMemoRelations(ctx context.Context, find *store.FindMemoRelation) ([]*store.MemoRelation, error) {where, args := []string{"TRUE"}, []any{}if find.MemoID != nil {- where, args = append(where, "memo_id = ?"), append(args, find.MemoID)+ where, args = append(where, "`memo_id` = ?"), append(args, find.MemoID)}if find.RelatedMemoID != nil {- where, args = append(where, "related_memo_id = ?"), append(args, find.RelatedMemoID)+ where, args = append(where, "`related_memo_id` = ?"), append(args, find.RelatedMemoID)}if find.Type != nil {- where, args = append(where, "type = ?"), append(args, find.Type)+ where, args = append(where, "`type` = ?"), append(args, find.Type)}- rows, err := d.db.QueryContext(ctx, `- SELECT- memo_id,- related_memo_id,- type- FROM memo_relation- WHERE `+strings.Join(where, " AND "), args...)+ rows, err := d.db.QueryContext(ctx, "SELECT `memo_id`, `related_memo_id`, `type` FROM `memo_relation` WHERE "+strings.Join(where, " AND "), args...)if err != nil {return nil, err}@@ -86,17 +71,15 @@ func (d *DB) ListMemoRelations(ctx context.Context, find *store.FindMemoRelationfunc (d *DB) DeleteMemoRelation(ctx context.Context, delete *store.DeleteMemoRelation) error {where, args := []string{"TRUE"}, []any{}if delete.MemoID != nil {- where, args = append(where, "memo_id = ?"), append(args, delete.MemoID)+ where, args = append(where, "`memo_id` = ?"), append(args, delete.MemoID)}if delete.RelatedMemoID != nil {- where, args = append(where, "related_memo_id = ?"), append(args, delete.RelatedMemoID)+ where, args = append(where, "`related_memo_id` = ?"), append(args, delete.RelatedMemoID)}if delete.Type != nil {- where, args = append(where, "type = ?"), append(args, delete.Type)+ where, args = append(where, "`type` = ?"), append(args, delete.Type)}- stmt := `- DELETE FROM memo_relation- WHERE ` + strings.Join(where, " AND ")+ stmt := "DELETE FROM `memo_relation` WHERE " + strings.Join(where, " AND ")result, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return err@@ -108,10 +91,7 @@ func (d *DB) DeleteMemoRelation(ctx context.Context, delete *store.DeleteMemoRel}func vacuumMemoRelations(ctx context.Context, tx *sql.Tx) error {- if _, err := tx.ExecContext(ctx, `- DELETE FROM memo_relation- WHERE memo_id NOT IN (SELECT id FROM memo) OR related_memo_id NOT IN (SELECT id FROM memo)- `); err != nil {+ if _, err := tx.ExecContext(ctx, "DELETE FROM `memo_relation` WHERE `memo_id` NOT IN (SELECT `id` FROM `memo`) OR `related_memo_id` NOT IN (SELECT `id` FROM `memo`)"); err != nil {return err}return nildiff --git a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql b/store/db/mysql/migration/dev/LATEST__SCHEMA.sqlindex 0dd00e8df..74e5daed0 100644--- a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/mysql/migration/dev/LATEST__SCHEMA.sql@@ -81,7 +81,7 @@ CREATE TABLE `resource` (`created_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`updated_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`filename` TEXT NOT NULL,- `blob` BLOB,+ `blob` MEDIUMBLOB,`external_link` TEXT NOT NULL,`type` VARCHAR(255) NOT NULL DEFAULT '',`size` INT NOT NULL DEFAULT '0',diff --git a/store/db/mysql/migration/prod/LATEST__SCHEMA.sql b/store/db/mysql/migration/prod/LATEST__SCHEMA.sqlindex 0dd00e8df..74e5daed0 100644--- a/store/db/mysql/migration/prod/LATEST__SCHEMA.sql+++ b/store/db/mysql/migration/prod/LATEST__SCHEMA.sql@@ -81,7 +81,7 @@ CREATE TABLE `resource` (`created_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`updated_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`filename` TEXT NOT NULL,- `blob` BLOB,+ `blob` MEDIUMBLOB,`external_link` TEXT NOT NULL,`type` VARCHAR(255) NOT NULL DEFAULT '',`size` INT NOT NULL DEFAULT '0',diff --git a/store/db/mysql/migration_history.go b/store/db/mysql/migration_history.goindex 26bab86cc..8eca1768d 100644--- a/store/db/mysql/migration_history.go+++ b/store/db/mysql/migration_history.go@@ -22,15 +22,10 @@ func (d *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistorwhere, args := []string{"1 = 1"}, []any{}if v := find.Version; v != nil {- where, args = append(where, "version = ?"), append(args, *v)+ where, args = append(where, "`version` = ?"), append(args, *v)}- query := `- SELECT version, UNIX_TIMESTAMP(created_ts)- FROM migration_history- WHERE ` + strings.Join(where, " AND ") + `- ORDER BY created_ts DESC- `+ query := "SELECT `version`, UNIX_TIMESTAMP(`created_ts`) FROM `migration_history` WHERE " + strings.Join(where, " AND ") + " ORDER BY `created_ts` DESC"rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -58,21 +53,14 @@ func (d *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistor}func (d *DB) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {- stmt := `- INSERT INTO migration_history (version) VALUES (?)- ON DUPLICATE KEY UPDATE version = ?- `+ stmt := "INSERT INTO `migration_history` (`version`) VALUES (?) ON DUPLICATE KEY UPDATE `version` = ?"_, err := d.db.ExecContext(ctx, stmt, upsert.Version, upsert.Version)if err != nil {return nil, err}var migrationHistory MigrationHistory- stmt = `- SELECT version, UNIX_TIMESTAMP(created_ts)- FROM migration_history- WHERE version = ?- `+ stmt = "SELECT `version`, UNIX_TIMESTAMP(`created_ts`) FROM `migration_history` WHERE `version` = ?"if err := d.db.QueryRowContext(ctx, stmt, upsert.Version).Scan(&migrationHistory.Version,&migrationHistory.CreatedTs,diff --git a/store/db/mysql/resource.go b/store/db/mysql/resource.goindex 4a1fc2246..4383360a4 100644--- a/store/db/mysql/resource.go+++ b/store/db/mysql/resource.go@@ -12,7 +12,7 @@ import ()func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {- stmt := "INSERT INTO resource (`filename`, `blob`, `external_link`, `type`, `size`, `creator_id`, `internal_path`) VALUES (?, ?, ?, ?, ?, ?, ?)"+ stmt := "INSERT INTO `resource` (`filename`, `blob`, `external_link`, `type`, `size`, `creator_id`, `internal_path`) VALUES (?, ?, ?, ?, ?, ?, ?)"result, err := d.db.ExecContext(ctx,stmt,@@ -49,34 +49,27 @@ func (d *DB) ListResources(ctx context.Context, find *store.FindResource) ([]*stwhere, args := []string{"1 = 1"}, []any{}if v := find.ID; v != nil {- where, args = append(where, "id = ?"), append(args, *v)+ where, args = append(where, "`id` = ?"), append(args, *v)}if v := find.CreatorID; v != nil {- where, args = append(where, "creator_id = ?"), append(args, *v)+ where, args = append(where, "`creator_id` = ?"), append(args, *v)}if v := find.Filename; v != nil {- where, args = append(where, "filename = ?"), append(args, *v)+ where, args = append(where, "`filename` = ?"), append(args, *v)}if v := find.MemoID; v != nil {- where, args = append(where, "memo_id = ?"), append(args, *v)+ where, args = append(where, "`memo_id` = ?"), append(args, *v)}if find.HasRelatedMemo {- where = append(where, "memo_id IS NOT NULL")+ where = append(where, "`memo_id` IS NOT NULL")}- fields := []string{"id", "filename", "external_link", "type", "size", "creator_id", "UNIX_TIMESTAMP(created_ts)", "UNIX_TIMESTAMP(updated_ts)", "internal_path", "memo_id"}+ fields := []string{"`id`", "`filename`", "`external_link`", "`type`", "`size`", "`creator_id`", "UNIX_TIMESTAMP(`created_ts`)", "UNIX_TIMESTAMP(`updated_ts`)", "`internal_path`", "`memo_id`"}if find.GetBlob {- fields = append(fields, "blob")+ fields = append(fields, "`blob`")}- query := fmt.Sprintf(`- SELECT- %s- FROM resource- WHERE %s- GROUP BY id- ORDER BY created_ts DESC- `, strings.Join(fields, ", "), strings.Join(where, " AND "))+ query := fmt.Sprintf("SELECT %s FROM `resource` WHERE %s GROUP BY `id` ORDER BY `created_ts` DESC", strings.Join(fields, ", "), strings.Join(where, " AND "))if find.Limit != nil {query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)if find.Offset != nil {@@ -129,27 +122,23 @@ func (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (set, args := []string{}, []any{}if v := update.UpdatedTs; v != nil {- set, args = append(set, "updated_ts = ?"), append(args, *v)+ set, args = append(set, "`updated_ts` = ?"), append(args, *v)}if v := update.Filename; v != nil {- set, args = append(set, "filename = ?"), append(args, *v)+ set, args = append(set, "`filename` = ?"), append(args, *v)}if v := update.InternalPath; v != nil {- set, args = append(set, "internal_path = ?"), append(args, *v)+ set, args = append(set, "`internal_path` = ?"), append(args, *v)}if v := update.MemoID; v != nil {- set, args = append(set, "memo_id = ?"), append(args, *v)+ set, args = append(set, "`memo_id` = ?"), append(args, *v)}if v := update.Blob; v != nil {- set, args = append(set, "blob = ?"), append(args, v)+ set, args = append(set, "`blob` = ?"), append(args, v)}args = append(args, update.ID)- stmt := `- UPDATE resource- SET ` + strings.Join(set, ", ") + `- WHERE id = ?- `+ stmt := "UPDATE `resource` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"if _, err := d.db.ExecContext(ctx, stmt, args...); err != nil {return nil, err}@@ -166,7 +155,7 @@ func (d *DB) UpdateResource(ctx context.Context, update *store.UpdateResource) (}func (d *DB) DeleteResource(ctx context.Context, delete *store.DeleteResource) error {- stmt := `DELETE FROM resource WHERE id = ?`+ stmt := "DELETE FROM `resource` WHERE `id` = ?"result, err := d.db.ExecContext(ctx, stmt, delete.ID)if err != nil {return err@@ -184,16 +173,7 @@ func (d *DB) DeleteResource(ctx context.Context, delete *store.DeleteResource) e}func vacuumResource(ctx context.Context, tx *sql.Tx) error {- stmt := `- DELETE FROM- resource- WHERE- creator_id NOT IN (- SELECT- id- FROM- user- )`+ stmt := "DELETE FROM `resource` WHERE `creator_id` NOT IN (SELECT `id` FROM `user`)"_, err := tx.ExecContext(ctx, stmt)if err != nil {return errdiff --git a/store/db/mysql/storage.go b/store/db/mysql/storage.goindex 16246d2b0..1fd9cb9e5 100644--- a/store/db/mysql/storage.go+++ b/store/db/mysql/storage.go@@ -8,14 +8,7 @@ import ()func (d *DB) CreateStorage(ctx context.Context, create *store.Storage) (*store.Storage, error) {- stmt := `- INSERT INTO storage (- name,- type,- config- )- VALUES (?, ?, ?)- `+ stmt := "INSERT INTO `storage` (`name`, `type`, `config`) VALUES (?, ?, ?)"result, err := d.db.ExecContext(ctx, stmt, create.Name, create.Type, create.Config)if err != nil {return nil, err@@ -33,18 +26,10 @@ func (d *DB) CreateStorage(ctx context.Context, create *store.Storage) (*store.Sfunc (d *DB) ListStorages(ctx context.Context, find *store.FindStorage) ([]*store.Storage, error) {where, args := []string{"1 = 1"}, []any{}if find.ID != nil {- where, args = append(where, "id = ?"), append(args, *find.ID)+ where, args = append(where, "`id` = ?"), append(args, *find.ID)}- rows, err := d.db.QueryContext(ctx, `- SELECT- id,- name,- type,- config- FROM storage- WHERE `+strings.Join(where, " AND ")+`- ORDER BY id DESC`,+ rows, err := d.db.QueryContext(ctx, "SELECT `id`, `name`, `type`, `config` FROM `storage` WHERE "+strings.Join(where, " AND ")+" ORDER BY `id` DESC",args...,)if err != nil {@@ -88,27 +73,23 @@ func (d *DB) GetStorage(ctx context.Context, find *store.FindStorage) (*store.Stfunc (d *DB) UpdateStorage(ctx context.Context, update *store.UpdateStorage) (*store.Storage, error) {set, args := []string{}, []any{}if update.Name != nil {- set = append(set, "name = ?")+ set = append(set, "`name` = ?")args = append(args, *update.Name)}if update.Config != nil {- set = append(set, "config = ?")+ set = append(set, "`config` = ?")args = append(args, *update.Config)}args = append(args, update.ID)- stmt := `- UPDATE storage- SET ` + strings.Join(set, ", ") + `- WHERE id = ?- `+ stmt := "UPDATE `storage` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"_, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return nil, err}storage := &store.Storage{}- stmt = `SELECT id,name,type,config FROM storage WHERE id = ?`+ stmt = "SELECT `id`, `name`, `type`, `config` FROM `storage` WHERE `id` = ?"if err := d.db.QueryRowContext(ctx, stmt, update.ID).Scan(&storage.ID,&storage.Name,@@ -122,10 +103,7 @@ func (d *DB) UpdateStorage(ctx context.Context, update *store.UpdateStorage) (*s}func (d *DB) DeleteStorage(ctx context.Context, delete *store.DeleteStorage) error {- stmt := `- DELETE FROM storage- WHERE id = ?- `+ stmt := "DELETE FROM `storage` WHERE `id` = ?"result, err := d.db.ExecContext(ctx, stmt, delete.ID)if err != nil {return errdiff --git a/store/db/mysql/system_setting.go b/store/db/mysql/system_setting.goindex 6492c9cd1..08285bffc 100644--- a/store/db/mysql/system_setting.go+++ b/store/db/mysql/system_setting.go@@ -8,13 +8,7 @@ import ()func (d *DB) UpsertSystemSetting(ctx context.Context, upsert *store.SystemSetting) (*store.SystemSetting, error) {- stmt := `- INSERT INTO system_setting (- name, value, description- )- VALUES (?, ?, ?)- ON DUPLICATE KEY UPDATE value = ?, description = ?- `+ stmt := "INSERT INTO `system_setting` (`name`, `value`, `description`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?, `description` = ?"_, err := d.db.ExecContext(ctx,stmt,@@ -34,17 +28,10 @@ func (d *DB) UpsertSystemSetting(ctx context.Context, upsert *store.SystemSettinfunc (d *DB) ListSystemSettings(ctx context.Context, find *store.FindSystemSetting) ([]*store.SystemSetting, error) {where, args := []string{"1 = 1"}, []any{}if find.Name != "" {- where, args = append(where, "name = ?"), append(args, find.Name)+ where, args = append(where, "`name` = ?"), append(args, find.Name)}- query := `- SELECT- name,- value,- description- FROM system_setting- WHERE ` + strings.Join(where, " AND ")-+ query := "SELECT `name`, `value`, `description` FROM `system_setting` WHERE " + strings.Join(where, " AND ")rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, errdiff --git a/store/db/mysql/tag.go b/store/db/mysql/tag.goindex ce9096c61..e7ab173e1 100644--- a/store/db/mysql/tag.go+++ b/store/db/mysql/tag.go@@ -9,11 +9,7 @@ import ()func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, error) {- stmt := `- INSERT INTO tag (name, creator_id)- VALUES (?, ?)- ON DUPLICATE KEY UPDATE name = ?- `+ stmt := "INSERT INTO `tag` (`name`, `creator_id`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `name` = ?"if _, err := d.db.ExecContext(ctx, stmt, upsert.Name, upsert.CreatorID, upsert.Name); err != nil {return nil, err}@@ -22,15 +18,8 @@ func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, erro}func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {- where, args := []string{"creator_id = ?"}, []any{find.CreatorID}- query := `- SELECT- name,- creator_id- FROM tag- WHERE ` + strings.Join(where, " AND ") + `- ORDER BY name ASC- `+ where, args := []string{"`creator_id` = ?"}, []any{find.CreatorID}+ query := "SELECT `name`, `creator_id` FROM `tag` WHERE " + strings.Join(where, " AND ") + " ORDER BY name ASC"rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -58,8 +47,8 @@ func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, e}func (d *DB) DeleteTag(ctx context.Context, delete *store.DeleteTag) error {- where, args := []string{"name = ?", "creator_id = ?"}, []any{delete.Name, delete.CreatorID}- stmt := `DELETE FROM tag WHERE ` + strings.Join(where, " AND ")+ where, args := []string{"`name` = ?", "`creator_id` = ?"}, []any{delete.Name, delete.CreatorID}+ stmt := "DELETE FROM `tag` WHERE " + strings.Join(where, " AND ")result, err := d.db.ExecContext(ctx, stmt, args...)if err != nil {return err@@ -71,16 +60,7 @@ func (d *DB) DeleteTag(ctx context.Context, delete *store.DeleteTag) error {}func vacuumTag(ctx context.Context, tx *sql.Tx) error {- stmt := `- DELETE FROM- tag- WHERE- creator_id NOT IN (- SELECT- id- FROM- user- )`+ stmt := "DELETE FROM `tag` WHERE `creator_id` NOT IN (SELECT `id` FROM `user`)"_, err := tx.ExecContext(ctx, stmt)if err != nil {return errdiff --git a/store/db/mysql/user.go b/store/db/mysql/user.goindex e63478e77..d6f66d92d 100644--- a/store/db/mysql/user.go+++ b/store/db/mysql/user.go@@ -10,17 +10,7 @@ import ()func (d *DB) CreateUser(ctx context.Context, create *store.User) (*store.User, error) {- stmt := `- INSERT INTO user (- username,- role,- email,- nickname,- password_hash,- avatar_url- )- VALUES (?, ?, ?, ?, ?, ?)- `+ stmt := "INSERT INTO `user` (`username`, `role`, `email`, `nickname`, `password_hash`, `avatar_url`) VALUES (?, ?, ?, ?, ?, ?)"result, err := d.db.ExecContext(ctx, stmt,create.Username,create.Role,@@ -53,52 +43,35 @@ func (d *DB) CreateUser(ctx context.Context, create *store.User) (*store.User, efunc (d *DB) UpdateUser(ctx context.Context, update *store.UpdateUser) (*store.User, error) {set, args := []string{}, []any{}if v := update.UpdatedTs; v != nil {- set, args = append(set, "updated_ts = ?"), append(args, *v)+ set, args = append(set, "`updated_ts` = ?"), append(args, *v)}if v := update.RowStatus; v != nil {- set, args = append(set, "row_status = ?"), append(args, *v)+ set, args = append(set, "`row_status` = ?"), append(args, *v)}if v := update.Username; v != nil {- set, args = append(set, "username = ?"), append(args, *v)+ set, args = append(set, "`username` = ?"), append(args, *v)}if v := update.Email; v != nil {- set, args = append(set, "email = ?"), append(args, *v)+ set, args = append(set, "`email` = ?"), append(args, *v)}if v := update.Nickname; v != nil {- set, args = append(set, "nickname = ?"), append(args, *v)+ set, args = append(set, "`nickname` = ?"), append(args, *v)}if v := update.AvatarURL; v != nil {- set, args = append(set, "avatar_url = ?"), append(args, *v)+ set, args = append(set, "`avatar_url` = ?"), append(args, *v)}if v := update.PasswordHash; v != nil {- set, args = append(set, "password_hash = ?"), append(args, *v)+ set, args = append(set, "`password_hash` = ?"), append(args, *v)}args = append(args, update.ID)- query := `- UPDATE user- SET ` + strings.Join(set, ", ") + `- WHERE id = ?- `+ query := "UPDATE `user` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"if _, err := d.db.ExecContext(ctx, query, args...); err != nil {return nil, err}user := &store.User{}- query = `- SELECT- id,- username,- role,- email,- nickname,- password_hash,- avatar_url,- UNIX_TIMESTAMP(created_ts),- UNIX_TIMESTAMP(updated_ts),- row_status- FROM user WHERE id = ?- `+ query = "SELECT `id`, `username`, `role`, `email`, `nickname`, `password_hash`, `avatar_url`, UNIX_TIMESTAMP(`created_ts`), UNIX_TIMESTAMP(`updated_ts`), `row_status` FROM `user` WHERE `id` = ?"if err := d.db.QueryRowContext(ctx, query, update.ID).Scan(&user.ID,&user.Username,@@ -121,37 +94,22 @@ func (d *DB) ListUsers(ctx context.Context, find *store.FindUser) ([]*store.Userwhere, args := []string{"1 = 1"}, []any{}if v := find.ID; v != nil {- where, args = append(where, "id = ?"), append(args, *v)+ where, args = append(where, "`id` = ?"), append(args, *v)}if v := find.Username; v != nil {- where, args = append(where, "username = ?"), append(args, *v)+ where, args = append(where, "`username` = ?"), append(args, *v)}if v := find.Role; v != nil {- where, args = append(where, "role = ?"), append(args, *v)+ where, args = append(where, "`role` = ?"), append(args, *v)}if v := find.Email; v != nil {- where, args = append(where, "email = ?"), append(args, *v)+ where, args = append(where, "`email` = ?"), append(args, *v)}if v := find.Nickname; v != nil {- where, args = append(where, "nickname = ?"), append(args, *v)- }-- query := `- SELECT- id,- username,- role,- email,- nickname,- password_hash,- avatar_url,- UNIX_TIMESTAMP(created_ts),- UNIX_TIMESTAMP(updated_ts),- row_status- FROM user- WHERE ` + strings.Join(where, " AND ") + `- ORDER BY created_ts DESC, row_status DESC- `+ where, args = append(where, "`nickname` = ?"), append(args, *v)+ }++ query := "SELECT `id`, `username`, `role`, `email`, `nickname`, `password_hash`, `avatar_url`, UNIX_TIMESTAMP(`created_ts`), UNIX_TIMESTAMP(`updated_ts`), `row_status` FROM `user` WHERE " + strings.Join(where, " AND ") + " ORDER BY `created_ts` DESC, `row_status` DESC"rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -186,9 +144,7 @@ func (d *DB) ListUsers(ctx context.Context, find *store.FindUser) ([]*store.User}func (d *DB) DeleteUser(ctx context.Context, delete *store.DeleteUser) error {- result, err := d.db.ExecContext(ctx, `- DELETE FROM user WHERE id = ?- `, delete.ID)+ result, err := d.db.ExecContext(ctx, "DELETE FROM `user` WHERE `id` = ?", delete.ID)if err != nil {return err}diff --git a/store/db/mysql/user_setting.go b/store/db/mysql/user_setting.goindex 203673cdb..aa9ffba97 100644--- a/store/db/mysql/user_setting.go+++ b/store/db/mysql/user_setting.go@@ -13,7 +13,7 @@ import ()func (d *DB) UpsertUserSetting(ctx context.Context, upsert *store.UserSetting) (*store.UserSetting, error) {- stmt := "INSERT INTO user_setting (`user_id`, `key`, `value`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE value = ?"+ stmt := "INSERT INTO `user_setting` (`user_id`, `key`, `value`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?"if _, err := d.db.ExecContext(ctx, stmt, upsert.UserID, upsert.Key, upsert.Value, upsert.Value); err != nil {return nil, err}@@ -25,19 +25,13 @@ func (d *DB) ListUserSettings(ctx context.Context, find *store.FindUserSetting)where, args := []string{"1 = 1"}, []any{}if v := find.Key; v != "" {- where, args = append(where, "user_setting.key = ?"), append(args, v)+ where, args = append(where, "`key` = ?"), append(args, v)}if v := find.UserID; v != nil {- where, args = append(where, "user_id = ?"), append(args, *find.UserID)+ where, args = append(where, "`user_id` = ?"), append(args, *find.UserID)}- query := `- SELECT- user_id,- user_setting.key,- value- FROM user_setting- WHERE ` + strings.Join(where, " AND ")+ query := "SELECT `user_id`, `key`, `value` FROM `user_setting` WHERE " + strings.Join(where, " AND ")rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -65,11 +59,7 @@ func (d *DB) ListUserSettings(ctx context.Context, find *store.FindUserSetting)}func (d *DB) UpsertUserSettingV1(ctx context.Context, upsert *storepb.UserSetting) (*storepb.UserSetting, error) {- stmt := `- INSERT INTO user_setting (user_id, user_setting.key, value)- VALUES (?, ?, ?)- ON DUPLICATE KEY UPDATE value = ?- `+ stmt := "INSERT INTO `user_setting` (`user_id`, `key`, `value`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?"var valueString stringif upsert.Key == storepb.UserSettingKey_USER_SETTING_ACCESS_TOKENS {valueBytes, err := protojson.Marshal(upsert.GetAccessTokens())@@ -92,19 +82,13 @@ func (d *DB) ListUserSettingsV1(ctx context.Context, find *store.FindUserSettingwhere, args := []string{"1 = 1"}, []any{}if v := find.Key; v != storepb.UserSettingKey_USER_SETTING_KEY_UNSPECIFIED {- where, args = append(where, "user_setting.key = ?"), append(args, v.String())+ where, args = append(where, "`key` = ?"), append(args, v.String())}if v := find.UserID; v != nil {- where, args = append(where, "user_id = ?"), append(args, *find.UserID)+ where, args = append(where, "`user_id` = ?"), append(args, *find.UserID)}- query := `- SELECT- user_id,- user_setting.key,- value- FROM user_setting- WHERE ` + strings.Join(where, " AND ")+ query := "SELECT `user_id`, `key`, `value` FROM `user_setting` WHERE " + strings.Join(where, " AND ")rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err@@ -146,16 +130,7 @@ func (d *DB) ListUserSettingsV1(ctx context.Context, find *store.FindUserSetting}func vacuumUserSetting(ctx context.Context, tx *sql.Tx) error {- stmt := `- DELETE FROM- user_setting- WHERE- user_id NOT IN (- SELECT- id- FROM- user- )`+ stmt := "DELETE FROM `user_setting` WHERE `user_id` NOT IN (SELECT `id` FROM `user`)"_, err := tx.ExecContext(ctx, stmt)if err != nil {return errdiff --git a/store/db/sqlite/memo_relation.go b/store/db/sqlite/memo_relation.goindex 50bf25ca3..209c24b54 100644--- a/store/db/sqlite/memo_relation.go+++ b/store/db/sqlite/memo_relation.go@@ -16,8 +16,6 @@ func (d *DB) UpsertMemoRelation(ctx context.Context, create *store.MemoRelation)type)VALUES (?, ?, ?)- ON CONFLICT (memo_id, related_memo_id, type) DO UPDATE SET- type = EXCLUDED.typeRETURNING memo_id, related_memo_id, type`memoRelation := &store.MemoRelation{}