Skip to content

Commit cc9a214

Browse files
committed
revert: revert system_setting to instance_setting rename changes
Reverts only the system_setting → instance_setting rename related changes from commit d326c71. Keeps the resource → attachment rename changes intact. - Reverts table name back to system_setting in all database drivers (MySQL, PostgreSQL, SQLite) - Removes migration files for the system_setting rename - Reverts LATEST.sql files to use system_setting table
1 parent e75862d commit cc9a214

File tree

10 files changed

+24
-27
lines changed

10 files changed

+24
-27
lines changed

store/db/mysql/instance_setting.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func (d *DB) UpsertInstanceSetting(ctx context.Context, upsert *store.InstanceSetting) (*store.InstanceSetting, error) {
11-
stmt := "INSERT INTO `instance_setting` (`name`, `value`, `description`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?, `description` = ?"
11+
stmt := "INSERT INTO `system_setting` (`name`, `value`, `description`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?, `description` = ?"
1212
_, err := d.db.ExecContext(
1313
ctx,
1414
stmt,
@@ -31,7 +31,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
3131
where, args = append(where, "`name` = ?"), append(args, find.Name)
3232
}
3333

34-
query := "SELECT `name`, `value`, `description` FROM `instance_setting` WHERE " + strings.Join(where, " AND ")
34+
query := "SELECT `name`, `value`, `description` FROM `system_setting` WHERE " + strings.Join(where, " AND ")
3535
rows, err := d.db.QueryContext(ctx, query, args...)
3636
if err != nil {
3737
return nil, err
@@ -59,7 +59,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
5959
}
6060

6161
func (d *DB) DeleteInstanceSetting(ctx context.Context, delete *store.DeleteInstanceSetting) error {
62-
stmt := "DELETE FROM `instance_setting` WHERE `name` = ?"
62+
stmt := "DELETE FROM `system_setting` WHERE `name` = ?"
6363
_, err := d.db.ExecContext(ctx, stmt, delete.Name)
6464
return err
6565
}

store/db/postgres/instance_setting.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func (d *DB) UpsertInstanceSetting(ctx context.Context, upsert *store.InstanceSetting) (*store.InstanceSetting, error) {
1111
stmt := `
12-
INSERT INTO instance_setting (
12+
INSERT INTO system_setting (
1313
name, value, description
1414
)
1515
VALUES ($1, $2, $3)
@@ -36,7 +36,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
3636
name,
3737
value,
3838
description
39-
FROM instance_setting
39+
FROM system_setting
4040
WHERE ` + strings.Join(where, " AND ")
4141

4242
rows, err := d.db.QueryContext(ctx, query, args...)
@@ -66,7 +66,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
6666
}
6767

6868
func (d *DB) DeleteInstanceSetting(ctx context.Context, delete *store.DeleteInstanceSetting) error {
69-
stmt := `DELETE FROM instance_setting WHERE name = $1`
69+
stmt := `DELETE FROM system_setting WHERE name = $1`
7070
_, err := d.db.ExecContext(ctx, stmt, delete.Name)
7171
return err
7272
}

store/db/sqlite/instance_setting.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func (d *DB) UpsertInstanceSetting(ctx context.Context, upsert *store.InstanceSetting) (*store.InstanceSetting, error) {
1111
stmt := `
12-
INSERT INTO instance_setting (
12+
INSERT INTO system_setting (
1313
name, value, description
1414
)
1515
VALUES (?, ?, ?)
@@ -36,7 +36,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
3636
name,
3737
value,
3838
description
39-
FROM instance_setting
39+
FROM system_setting
4040
WHERE ` + strings.Join(where, " AND ")
4141

4242
rows, err := d.db.QueryContext(ctx, query, args...)
@@ -66,7 +66,7 @@ func (d *DB) ListInstanceSettings(ctx context.Context, find *store.FindInstanceS
6666
}
6767

6868
func (d *DB) DeleteInstanceSetting(ctx context.Context, delete *store.DeleteInstanceSetting) error {
69-
stmt := "DELETE FROM instance_setting WHERE name = ?"
69+
stmt := "DELETE FROM system_setting WHERE name = ?"
7070
_, err := d.db.ExecContext(ctx, stmt, delete.Name)
7171
return err
7272
}

store/migration/mysql/0.26/01__rename_system_setting_to_instance_setting.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

store/migration/mysql/LATEST.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
-- instance_setting
2-
CREATE TABLE `instance_setting` (
1+
-- system_setting
2+
CREATE TABLE `system_setting` (
33
`name` VARCHAR(256) NOT NULL PRIMARY KEY,
44
`value` LONGTEXT NOT NULL,
55
`description` TEXT NOT NULL
@@ -58,8 +58,8 @@ CREATE TABLE `memo_relation` (
5858
UNIQUE(`memo_id`,`related_memo_id`,`type`)
5959
);
6060

61-
-- attachment
62-
CREATE TABLE `attachment` (
61+
-- resource
62+
CREATE TABLE `resource` (
6363
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
6464
`uid` VARCHAR(256) NOT NULL UNIQUE,
6565
`creator_id` INT NOT NULL,

store/migration/postgres/0.26/01__rename_system_setting_to_instance_setting.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

store/migration/postgres/LATEST.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
-- instance_setting
2-
CREATE TABLE instance_setting (
1+
-- system_setting
2+
CREATE TABLE system_setting (
33
name TEXT NOT NULL PRIMARY KEY,
44
value TEXT NOT NULL,
55
description TEXT NOT NULL
@@ -58,8 +58,8 @@ CREATE TABLE memo_relation (
5858
UNIQUE(memo_id, related_memo_id, type)
5959
);
6060

61-
-- attachment
62-
CREATE TABLE attachment (
61+
-- resource
62+
CREATE TABLE resource (
6363
id SERIAL PRIMARY KEY,
6464
uid TEXT NOT NULL UNIQUE,
6565
creator_id INTEGER NOT NULL,

store/migration/sqlite/0.26/01__rename_system_setting_to_instance_setting.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

store/migration/sqlite/LATEST.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
-- instance_setting
2-
CREATE TABLE instance_setting (
1+
-- system_setting
2+
CREATE TABLE system_setting (
33
name TEXT NOT NULL,
44
value TEXT NOT NULL,
55
description TEXT NOT NULL DEFAULT '',
@@ -63,8 +63,8 @@ CREATE TABLE memo_relation (
6363
UNIQUE(memo_id, related_memo_id, type)
6464
);
6565

66-
-- attachment
67-
CREATE TABLE attachment (
66+
-- resource
67+
CREATE TABLE resource (
6868
id INTEGER PRIMARY KEY AUTOINCREMENT,
6969
uid TEXT NOT NULL UNIQUE,
7070
creator_id INTEGER NOT NULL,
@@ -80,9 +80,9 @@ CREATE TABLE attachment (
8080
payload TEXT NOT NULL DEFAULT '{}'
8181
);
8282

83-
CREATE INDEX idx_attachment_creator_id ON attachment (creator_id);
83+
CREATE INDEX idx_resource_creator_id ON resource (creator_id);
8484

85-
CREATE INDEX idx_attachment_memo_id ON attachment (memo_id);
85+
CREATE INDEX idx_resource_memo_id ON resource (memo_id);
8686

8787
-- activity
8888
CREATE TABLE activity (

store/test/migrator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ func TestGetCurrentSchemaVersion(t *testing.T) {
1313

1414
currentSchemaVersion, err := ts.GetCurrentSchemaVersion()
1515
require.NoError(t, err)
16-
require.Equal(t, "0.26.2", currentSchemaVersion)
16+
require.Equal(t, "0.26.1", currentSchemaVersion)
1717
}

0 commit comments

Comments
 (0)