refactor: rename config table to system_config

This commit is contained in:
spiral 2021-12-01 09:16:44 -05:00
parent a0d2773ef4
commit fc7a6357c0
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
4 changed files with 10 additions and 10 deletions

View File

@ -23,9 +23,9 @@
as $$ as $$
-- CTEs to query "static" (accessible only through args) data -- CTEs to query "static" (accessible only through args) data
with with
system as (select systems.*, config.latch_timeout, system_guild.tag as guild_tag, system_guild.tag_enabled as tag_enabled, allow_autoproxy as account_autoproxy from accounts system as (select systems.*, system_config.latch_timeout, system_guild.tag as guild_tag, system_guild.tag_enabled as tag_enabled, allow_autoproxy as account_autoproxy from accounts
left join systems on systems.id = accounts.system left join systems on systems.id = accounts.system
left join config on config.system = accounts.system left join system_config on system_config.system = accounts.system
left join system_guild on system_guild.system = accounts.system and system_guild.guild = guild_id left join system_guild on system_guild.system = accounts.system and system_guild.guild = guild_id
where accounts.uid = account_id), where accounts.uid = account_id),
guild as (select * from servers where id = guild_id), guild as (select * from servers where id = guild_id),
@ -49,12 +49,12 @@ as $$
coalesce(system.tag_enabled, true) as tag_enabled, coalesce(system.tag_enabled, true) as tag_enabled,
system.avatar_url as system_avatar, system.avatar_url as system_avatar,
system.account_autoproxy as allow_autoproxy, system.account_autoproxy as allow_autoproxy,
config.latch_timeout as latch_timeout system_config.latch_timeout as latch_timeout
-- We need a "from" clause, so we just use some bogus data that's always present -- We need a "from" clause, so we just use some bogus data that's always present
-- This ensure we always have exactly one row going forward, so we can left join afterwards and still get data -- This ensure we always have exactly one row going forward, so we can left join afterwards and still get data
from (select 1) as _placeholder from (select 1) as _placeholder
left join system on true left join system on true
left join config on true left join system_config on true
left join guild on true left join guild on true
left join last_message on true left join last_message on true
left join system_last_switch on system_last_switch.system = system.id left join system_last_switch on system_last_switch.system = system.id

View File

@ -1,7 +1,7 @@
-- schema version 21 -- schema version 21
-- create `config` table -- create `system_config` table
create table config ( create table system_config (
system int primary key references systems(id) on delete cascade, system int primary key references systems(id) on delete cascade,
ui_tz text not null default 'UTC', ui_tz text not null default 'UTC',
pings_enabled bool not null default true, pings_enabled bool not null default true,
@ -10,7 +10,7 @@ create table config (
group_limit_override int group_limit_override int
); );
insert into config select insert into system_config select
id as system, id as system,
ui_tz, ui_tz,
pings_enabled, pings_enabled,

View File

@ -80,7 +80,7 @@ public partial class ModelRepository
var system = await _db.QueryFirst<PKSystem>(conn, query, "returning *"); var system = await _db.QueryFirst<PKSystem>(conn, query, "returning *");
_logger.Information("Created {SystemId}", system.Id); _logger.Information("Created {SystemId}", system.Id);
var (q, pms) = ("insert into config (system) values (@system)", new { system = system.Id }); var (q, pms) = ("insert into system_config (system) values (@system)", new { system = system.Id });
if (conn == null) if (conn == null)
await _db.Execute(conn => conn.QueryAsync(q, pms)); await _db.Execute(conn => conn.QueryAsync(q, pms));

View File

@ -5,11 +5,11 @@ namespace PluralKit.Core;
public partial class ModelRepository public partial class ModelRepository
{ {
public Task<SystemConfig> GetSystemConfig(SystemId system, IPKConnection conn = null) public Task<SystemConfig> GetSystemConfig(SystemId system, IPKConnection conn = null)
=> _db.QueryFirst<SystemConfig>(conn, new Query("config").Where("system", system)); => _db.QueryFirst<SystemConfig>(conn, new Query("system_config").Where("system", system));
public async Task<SystemConfig> UpdateSystemConfig(SystemId system, SystemConfigPatch patch, IPKConnection conn = null) public async Task<SystemConfig> UpdateSystemConfig(SystemId system, SystemConfigPatch patch, IPKConnection conn = null)
{ {
var query = patch.Apply(new Query("config").Where("system", system)); var query = patch.Apply(new Query("system_config").Where("system", system));
var config = await _db.QueryFirst<SystemConfig>(conn, query, "returning *"); var config = await _db.QueryFirst<SystemConfig>(conn, query, "returning *");
_ = _dispatch.Dispatch(system, new UpdateDispatchData _ = _dispatch.Dispatch(system, new UpdateDispatchData