From 5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Thu, 11 Jun 2026 00:54:30 +0200 Subject: chore: Move everything into one big crate That helps remove duplicated code and rustc/cargo will now also show dead code correctly. --- .../migrations/20210425153745_create_history.sql | 11 ----- .../migrations/20210425153757_create_users.sql | 10 ----- .../migrations/20210425153800_create_sessions.sql | 6 --- .../20220419082412_add_count_trigger.sql | 51 ---------------------- .../20220421073605_fix_count_trigger_delete.sql | 35 --------------- .../migrations/20220421174016_larger-commands.sql | 3 -- .../migrations/20220426172813_user-created-at.sql | 1 - .../migrations/20220505082442_create-events.sql | 14 ------ .../migrations/20220610074049_history-length.sql | 2 - .../migrations/20230315220537_drop-events.sql | 2 - .../migrations/20230315224203_create-deleted.sql | 5 --- .../20230515221038_trigger-delete-only.sql | 30 ------------- .../migrations/20230623070418_records.sql | 15 ------- .../migrations/20231202170508_create-store.sql | 15 ------- .../migrations/20231203124112_create-store-idx.sql | 2 - .../20240108124837_drop-some-defaults.sql | 4 -- .../migrations/20240614104159_idx-cache.sql | 8 ---- .../migrations/20240621110731_user-verified.sql | 8 ---- .../migrations/20240702094825_idx_cache_index.sql | 1 - .../20260127000000_remove-email-verification.sql | 2 - 20 files changed, 225 deletions(-) delete mode 100644 crates/atuin-server-postgres/migrations/20210425153745_create_history.sql delete mode 100644 crates/atuin-server-postgres/migrations/20210425153757_create_users.sql delete mode 100644 crates/atuin-server-postgres/migrations/20210425153800_create_sessions.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220419082412_add_count_trigger.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220421073605_fix_count_trigger_delete.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220421174016_larger-commands.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220426172813_user-created-at.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220505082442_create-events.sql delete mode 100644 crates/atuin-server-postgres/migrations/20220610074049_history-length.sql delete mode 100644 crates/atuin-server-postgres/migrations/20230315220537_drop-events.sql delete mode 100644 crates/atuin-server-postgres/migrations/20230315224203_create-deleted.sql delete mode 100644 crates/atuin-server-postgres/migrations/20230515221038_trigger-delete-only.sql delete mode 100644 crates/atuin-server-postgres/migrations/20230623070418_records.sql delete mode 100644 crates/atuin-server-postgres/migrations/20231202170508_create-store.sql delete mode 100644 crates/atuin-server-postgres/migrations/20231203124112_create-store-idx.sql delete mode 100644 crates/atuin-server-postgres/migrations/20240108124837_drop-some-defaults.sql delete mode 100644 crates/atuin-server-postgres/migrations/20240614104159_idx-cache.sql delete mode 100644 crates/atuin-server-postgres/migrations/20240621110731_user-verified.sql delete mode 100644 crates/atuin-server-postgres/migrations/20240702094825_idx_cache_index.sql delete mode 100644 crates/atuin-server-postgres/migrations/20260127000000_remove-email-verification.sql (limited to 'crates/atuin-server-postgres/migrations') diff --git a/crates/atuin-server-postgres/migrations/20210425153745_create_history.sql b/crates/atuin-server-postgres/migrations/20210425153745_create_history.sql deleted file mode 100644 index 2c2d17b0..00000000 --- a/crates/atuin-server-postgres/migrations/20210425153745_create_history.sql +++ /dev/null @@ -1,11 +0,0 @@ -create table history ( - id bigserial primary key, - client_id text not null unique, -- the client-generated ID - user_id bigserial not null, -- allow multiple users - hostname text not null, -- a unique identifier from the client (can be hashed, random, whatever) - timestamp timestamp not null, -- one of the few non-encrypted metadatas - - data varchar(8192) not null, -- store the actual history data, encrypted. I don't wanna know! - - created_at timestamp not null default current_timestamp -); diff --git a/crates/atuin-server-postgres/migrations/20210425153757_create_users.sql b/crates/atuin-server-postgres/migrations/20210425153757_create_users.sql deleted file mode 100644 index a25dcced..00000000 --- a/crates/atuin-server-postgres/migrations/20210425153757_create_users.sql +++ /dev/null @@ -1,10 +0,0 @@ -create table users ( - id bigserial primary key, -- also store our own ID - username varchar(32) not null unique, -- being able to contact users is useful - email varchar(128) not null unique, -- being able to contact users is useful - password varchar(128) not null unique -); - --- the prior index is case sensitive :( -CREATE UNIQUE INDEX email_unique_idx on users (LOWER(email)); -CREATE UNIQUE INDEX username_unique_idx on users (LOWER(username)); diff --git a/crates/atuin-server-postgres/migrations/20210425153800_create_sessions.sql b/crates/atuin-server-postgres/migrations/20210425153800_create_sessions.sql deleted file mode 100644 index c2fb6559..00000000 --- a/crates/atuin-server-postgres/migrations/20210425153800_create_sessions.sql +++ /dev/null @@ -1,6 +0,0 @@ --- Add migration script here -create table sessions ( - id bigserial primary key, - user_id bigserial, - token varchar(128) unique not null -); diff --git a/crates/atuin-server-postgres/migrations/20220419082412_add_count_trigger.sql b/crates/atuin-server-postgres/migrations/20220419082412_add_count_trigger.sql deleted file mode 100644 index dd1afa88..00000000 --- a/crates/atuin-server-postgres/migrations/20220419082412_add_count_trigger.sql +++ /dev/null @@ -1,51 +0,0 @@ --- Prior to this, the count endpoint was super naive and just ran COUNT(1). --- This is slow asf. Now that we have an amount of actual traffic, --- stop doing that! --- This basically maintains a count, so we can read ONE row, instead of ALL the --- rows. Much better. --- Future optimisation could use some sort of cache so we don't even need to hit --- postgres at all. - -create table total_history_count_user( - id bigserial primary key, - user_id bigserial, - total integer -- try and avoid using keywords - hence total, not count -); - -create or replace function user_history_count() -returns trigger as -$func$ -begin - if (TG_OP='INSERT') then - update total_history_count_user set total = total + 1 where user_id = new.user_id; - - if not found then - insert into total_history_count_user(user_id, total) - values ( - new.user_id, - (select count(1) from history where user_id = new.user_id) - ); - end if; - - elsif (TG_OP='DELETE') then - update total_history_count_user set total = total - 1 where user_id = new.user_id; - - if not found then - insert into total_history_count_user(user_id, total) - values ( - new.user_id, - (select count(1) from history where user_id = new.user_id) - ); - end if; - end if; - - return NEW; -- this is actually ignored for an after trigger, but oh well -end; -$func$ -language plpgsql volatile -- pldfplplpflh -cost 100; -- default value - -create trigger tg_user_history_count - after insert or delete on history - for each row - execute procedure user_history_count(); diff --git a/crates/atuin-server-postgres/migrations/20220421073605_fix_count_trigger_delete.sql b/crates/atuin-server-postgres/migrations/20220421073605_fix_count_trigger_delete.sql deleted file mode 100644 index 6198f300..00000000 --- a/crates/atuin-server-postgres/migrations/20220421073605_fix_count_trigger_delete.sql +++ /dev/null @@ -1,35 +0,0 @@ --- the old version of this function used NEW in the delete part when it should --- use OLD - -create or replace function user_history_count() -returns trigger as -$func$ -begin - if (TG_OP='INSERT') then - update total_history_count_user set total = total + 1 where user_id = new.user_id; - - if not found then - insert into total_history_count_user(user_id, total) - values ( - new.user_id, - (select count(1) from history where user_id = new.user_id) - ); - end if; - - elsif (TG_OP='DELETE') then - update total_history_count_user set total = total - 1 where user_id = old.user_id; - - if not found then - insert into total_history_count_user(user_id, total) - values ( - old.user_id, - (select count(1) from history where user_id = old.user_id) - ); - end if; - end if; - - return NEW; -- this is actually ignored for an after trigger, but oh well -end; -$func$ -language plpgsql volatile -- pldfplplpflh -cost 100; -- default value diff --git a/crates/atuin-server-postgres/migrations/20220421174016_larger-commands.sql b/crates/atuin-server-postgres/migrations/20220421174016_larger-commands.sql deleted file mode 100644 index 0ac43433..00000000 --- a/crates/atuin-server-postgres/migrations/20220421174016_larger-commands.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Make it 4x larger. Most commands are less than this, but as it's base64 --- SOME are more than 8192. Should be enough for now. -ALTER TABLE history ALTER COLUMN data TYPE varchar(32768); diff --git a/crates/atuin-server-postgres/migrations/20220426172813_user-created-at.sql b/crates/atuin-server-postgres/migrations/20220426172813_user-created-at.sql deleted file mode 100644 index a9138194..00000000 --- a/crates/atuin-server-postgres/migrations/20220426172813_user-created-at.sql +++ /dev/null @@ -1 +0,0 @@ -alter table users add column created_at timestamp not null default now(); diff --git a/crates/atuin-server-postgres/migrations/20220505082442_create-events.sql b/crates/atuin-server-postgres/migrations/20220505082442_create-events.sql deleted file mode 100644 index 57e16ec7..00000000 --- a/crates/atuin-server-postgres/migrations/20220505082442_create-events.sql +++ /dev/null @@ -1,14 +0,0 @@ -create type event_type as enum ('create', 'delete'); - -create table events ( - id bigserial primary key, - client_id text not null unique, -- the client-generated ID - user_id bigserial not null, -- allow multiple users - hostname text not null, -- a unique identifier from the client (can be hashed, random, whatever) - timestamp timestamp not null, -- one of the few non-encrypted metadatas - - event_type event_type, - data text not null, -- store the actual history data, encrypted. I don't wanna know! - - created_at timestamp not null default current_timestamp -); diff --git a/crates/atuin-server-postgres/migrations/20220610074049_history-length.sql b/crates/atuin-server-postgres/migrations/20220610074049_history-length.sql deleted file mode 100644 index b1c23016..00000000 --- a/crates/atuin-server-postgres/migrations/20220610074049_history-length.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Add migration script here -alter table history alter column data type text; diff --git a/crates/atuin-server-postgres/migrations/20230315220537_drop-events.sql b/crates/atuin-server-postgres/migrations/20230315220537_drop-events.sql deleted file mode 100644 index fe3cae17..00000000 --- a/crates/atuin-server-postgres/migrations/20230315220537_drop-events.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Add migration script here -drop table events; diff --git a/crates/atuin-server-postgres/migrations/20230315224203_create-deleted.sql b/crates/atuin-server-postgres/migrations/20230315224203_create-deleted.sql deleted file mode 100644 index 9a9e6263..00000000 --- a/crates/atuin-server-postgres/migrations/20230315224203_create-deleted.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Add migration script here -alter table history add column if not exists deleted_at timestamp; - --- queries will all be selecting the ids of history for a user, that has been deleted -create index if not exists history_deleted_index on history(client_id, user_id, deleted_at); diff --git a/crates/atuin-server-postgres/migrations/20230515221038_trigger-delete-only.sql b/crates/atuin-server-postgres/migrations/20230515221038_trigger-delete-only.sql deleted file mode 100644 index 3d0bba52..00000000 --- a/crates/atuin-server-postgres/migrations/20230515221038_trigger-delete-only.sql +++ /dev/null @@ -1,30 +0,0 @@ --- We do not need to run the trigger on deletes, as the only time we are deleting history is when the user --- has already been deleted --- This actually slows down deleting all the history a good bit! - -create or replace function user_history_count() -returns trigger as -$func$ -begin - if (TG_OP='INSERT') then - update total_history_count_user set total = total + 1 where user_id = new.user_id; - - if not found then - insert into total_history_count_user(user_id, total) - values ( - new.user_id, - (select count(1) from history where user_id = new.user_id) - ); - end if; - end if; - - return NEW; -- this is actually ignored for an after trigger, but oh well -end; -$func$ -language plpgsql volatile -- pldfplplpflh -cost 100; -- default value - -create or replace trigger tg_user_history_count - after insert on history - for each row - execute procedure user_history_count(); diff --git a/crates/atuin-server-postgres/migrations/20230623070418_records.sql b/crates/atuin-server-postgres/migrations/20230623070418_records.sql deleted file mode 100644 index 22437595..00000000 --- a/crates/atuin-server-postgres/migrations/20230623070418_records.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add migration script here -create table records ( - id uuid primary key, -- remember to use uuidv7 for happy indices <3 - client_id uuid not null, -- I am too uncomfortable with the idea of a client-generated primary key - host uuid not null, -- a unique identifier for the host - parent uuid default null, -- the ID of the parent record, bearing in mind this is a linked list - timestamp bigint not null, -- not a timestamp type, as those do not have nanosecond precision - version text not null, - tag text not null, -- what is this? history, kv, whatever. Remember clients get a log per tag per host - data text not null, -- store the actual history data, encrypted. I don't wanna know! - cek text not null, - - user_id bigint not null, -- allow multiple users - created_at timestamp not null default current_timestamp -); diff --git a/crates/atuin-server-postgres/migrations/20231202170508_create-store.sql b/crates/atuin-server-postgres/migrations/20231202170508_create-store.sql deleted file mode 100644 index ffb57966..00000000 --- a/crates/atuin-server-postgres/migrations/20231202170508_create-store.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add migration script here -create table store ( - id uuid primary key, -- remember to use uuidv7 for happy indices <3 - client_id uuid not null, -- I am too uncomfortable with the idea of a client-generated primary key, even though it's fine mathematically - host uuid not null, -- a unique identifier for the host - idx bigint not null, -- the index of the record in this store, identified by (host, tag) - timestamp bigint not null, -- not a timestamp type, as those do not have nanosecond precision - version text not null, - tag text not null, -- what is this? history, kv, whatever. Remember clients get a log per tag per host - data text not null, -- store the actual history data, encrypted. I don't wanna know! - cek text not null, - - user_id bigint not null, -- allow multiple users - created_at timestamp not null default current_timestamp -); diff --git a/crates/atuin-server-postgres/migrations/20231203124112_create-store-idx.sql b/crates/atuin-server-postgres/migrations/20231203124112_create-store-idx.sql deleted file mode 100644 index 56d67145..00000000 --- a/crates/atuin-server-postgres/migrations/20231203124112_create-store-idx.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Add migration script here -create unique index record_uniq ON store(user_id, host, tag, idx); diff --git a/crates/atuin-server-postgres/migrations/20240108124837_drop-some-defaults.sql b/crates/atuin-server-postgres/migrations/20240108124837_drop-some-defaults.sql deleted file mode 100644 index ad2af5a1..00000000 --- a/crates/atuin-server-postgres/migrations/20240108124837_drop-some-defaults.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Add migration script here -alter table history alter column user_id drop default; -alter table sessions alter column user_id drop default; -alter table total_history_count_user alter column user_id drop default; diff --git a/crates/atuin-server-postgres/migrations/20240614104159_idx-cache.sql b/crates/atuin-server-postgres/migrations/20240614104159_idx-cache.sql deleted file mode 100644 index 76425ed7..00000000 --- a/crates/atuin-server-postgres/migrations/20240614104159_idx-cache.sql +++ /dev/null @@ -1,8 +0,0 @@ -create table store_idx_cache( - id bigserial primary key, - user_id bigint, - - host uuid, - tag text, - idx bigint -); diff --git a/crates/atuin-server-postgres/migrations/20240621110731_user-verified.sql b/crates/atuin-server-postgres/migrations/20240621110731_user-verified.sql deleted file mode 100644 index 6eba02ec..00000000 --- a/crates/atuin-server-postgres/migrations/20240621110731_user-verified.sql +++ /dev/null @@ -1,8 +0,0 @@ -alter table users add verified_at timestamp with time zone default null; - -create table user_verification_token( - id bigserial primary key, - user_id bigint unique references users(id), - token text, - valid_until timestamp with time zone -); diff --git a/crates/atuin-server-postgres/migrations/20240702094825_idx_cache_index.sql b/crates/atuin-server-postgres/migrations/20240702094825_idx_cache_index.sql deleted file mode 100644 index d1a7b194..00000000 --- a/crates/atuin-server-postgres/migrations/20240702094825_idx_cache_index.sql +++ /dev/null @@ -1 +0,0 @@ -create unique index store_idx_cache_uniq on store_idx_cache(user_id, host, tag); diff --git a/crates/atuin-server-postgres/migrations/20260127000000_remove-email-verification.sql b/crates/atuin-server-postgres/migrations/20260127000000_remove-email-verification.sql deleted file mode 100644 index 15309920..00000000 --- a/crates/atuin-server-postgres/migrations/20260127000000_remove-email-verification.sql +++ /dev/null @@ -1,2 +0,0 @@ -drop table if exists user_verification_token; -alter table users drop column if exists verified_at; -- cgit v1.3.1