aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-06-11 01:05:07 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-06-11 01:05:07 +0200
commit7a9e229d5f4913d1a48c92615bcb3234f5dcfd33 (patch)
tree21eacdafe35d4e36918dcac39688678f87ea4b0c
parentchore: Move everything into one big crate (diff)
downloadatuin-7a9e229d5f4913d1a48c92615bcb3234f5dcfd33.zip
chore: Restore db migrations
-rw-r--r--crates/turtle/db/client-meta-migrations/20260203030924_create_meta.sql5
-rw-r--r--crates/turtle/db/client-migrations/20210422143411_create_history.sql16
-rw-r--r--crates/turtle/db/client-migrations/20220505083406_create-events.sql11
-rw-r--r--crates/turtle/db/client-migrations/20220806155627_interactive_search_index.sql6
-rw-r--r--crates/turtle/db/client-migrations/20230315220114_drop-events.sql2
-rw-r--r--crates/turtle/db/client-migrations/20230319185725_deleted_at.sql2
-rw-r--r--crates/turtle/db/client-migrations/20260224000100_history_author_intent.sql2
-rw-r--r--crates/turtle/db/client-record-migrations/20230531212437_create-records.sql16
-rw-r--r--crates/turtle/db/client-record-migrations/20231127090831_create-store.sql15
-rw-r--r--crates/turtle/db/server-pg-migrations/20210425153745_create_history.sql11
-rw-r--r--crates/turtle/db/server-pg-migrations/20210425153757_create_users.sql10
-rw-r--r--crates/turtle/db/server-pg-migrations/20210425153800_create_sessions.sql6
-rw-r--r--crates/turtle/db/server-pg-migrations/20220419082412_add_count_trigger.sql51
-rw-r--r--crates/turtle/db/server-pg-migrations/20220421073605_fix_count_trigger_delete.sql35
-rw-r--r--crates/turtle/db/server-pg-migrations/20220421174016_larger-commands.sql3
-rw-r--r--crates/turtle/db/server-pg-migrations/20220426172813_user-created-at.sql1
-rw-r--r--crates/turtle/db/server-pg-migrations/20220505082442_create-events.sql14
-rw-r--r--crates/turtle/db/server-pg-migrations/20220610074049_history-length.sql2
-rw-r--r--crates/turtle/db/server-pg-migrations/20230315220537_drop-events.sql2
-rw-r--r--crates/turtle/db/server-pg-migrations/20230315224203_create-deleted.sql5
-rw-r--r--crates/turtle/db/server-pg-migrations/20230515221038_trigger-delete-only.sql30
-rw-r--r--crates/turtle/db/server-pg-migrations/20230623070418_records.sql15
-rw-r--r--crates/turtle/db/server-pg-migrations/20231202170508_create-store.sql15
-rw-r--r--crates/turtle/db/server-pg-migrations/20231203124112_create-store-idx.sql2
-rw-r--r--crates/turtle/db/server-pg-migrations/20240108124837_drop-some-defaults.sql4
-rw-r--r--crates/turtle/db/server-pg-migrations/20240614104159_idx-cache.sql8
-rw-r--r--crates/turtle/db/server-pg-migrations/20240621110731_user-verified.sql8
-rw-r--r--crates/turtle/db/server-pg-migrations/20240702094825_idx_cache_index.sql1
-rw-r--r--crates/turtle/db/server-pg-migrations/20260127000000_remove-email-verification.sql2
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20231203124112_create-store.sql17
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20240108124830_create-history.sql15
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20240108124831_create-sessions.sql6
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20240621110730_create-users.sql12
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20240621110731_create-user-verification-token.sql6
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20240702094825_create-store-idx-cache.sql10
-rw-r--r--crates/turtle/db/server-sqlite-migrations/20260127000000_remove-email-verification.sql2
-rw-r--r--crates/turtle/src/atuin_client/database.rs2
-rw-r--r--crates/turtle/src/atuin_client/meta.rs4
-rw-r--r--crates/turtle/src/atuin_client/record/sqlite_store.rs4
-rw-r--r--crates/turtle/src/atuin_daemon/mod.rs4
-rw-r--r--crates/turtle/src/atuin_server/settings.rs2
-rw-r--r--crates/turtle/src/atuin_server_postgres/mod.rs2
-rw-r--r--crates/turtle/src/atuin_server_sqlite/mod.rs2
-rw-r--r--flake.nix14
44 files changed, 380 insertions, 22 deletions
diff --git a/crates/turtle/db/client-meta-migrations/20260203030924_create_meta.sql b/crates/turtle/db/client-meta-migrations/20260203030924_create_meta.sql
new file mode 100644
index 00000000..26c3c142
--- /dev/null
+++ b/crates/turtle/db/client-meta-migrations/20260203030924_create_meta.sql
@@ -0,0 +1,5 @@
+create table if not exists meta (
+ key text not null primary key,
+ value text not null,
+ updated_at integer not null default (strftime('%s', 'now'))
+);
diff --git a/crates/turtle/db/client-migrations/20210422143411_create_history.sql b/crates/turtle/db/client-migrations/20210422143411_create_history.sql
new file mode 100644
index 00000000..1f3f8686
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20210422143411_create_history.sql
@@ -0,0 +1,16 @@
+-- Add migration script here
+create table if not exists history (
+ id text primary key,
+ timestamp integer not null,
+ duration integer not null,
+ exit integer not null,
+ command text not null,
+ cwd text not null,
+ session text not null,
+ hostname text not null,
+
+ unique(timestamp, cwd, command)
+);
+
+create index if not exists idx_history_timestamp on history(timestamp);
+create index if not exists idx_history_command on history(command);
diff --git a/crates/turtle/db/client-migrations/20220505083406_create-events.sql b/crates/turtle/db/client-migrations/20220505083406_create-events.sql
new file mode 100644
index 00000000..f6cafeba
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20220505083406_create-events.sql
@@ -0,0 +1,11 @@
+create table if not exists events (
+ id text primary key,
+ timestamp integer not null,
+ hostname text not null,
+ event_type text not null,
+
+ history_id text not null
+);
+
+-- Ensure there is only ever one of each event type per history item
+create unique index history_event_idx ON events(event_type, history_id);
diff --git a/crates/turtle/db/client-migrations/20220806155627_interactive_search_index.sql b/crates/turtle/db/client-migrations/20220806155627_interactive_search_index.sql
new file mode 100644
index 00000000..b5770e62
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20220806155627_interactive_search_index.sql
@@ -0,0 +1,6 @@
+-- Interactive search filters by command then by the max(timestamp) for that
+-- command. Create an index that covers those
+create index if not exists idx_history_command_timestamp on history(
+ command,
+ timestamp
+);
diff --git a/crates/turtle/db/client-migrations/20230315220114_drop-events.sql b/crates/turtle/db/client-migrations/20230315220114_drop-events.sql
new file mode 100644
index 00000000..fe3cae17
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20230315220114_drop-events.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+drop table events;
diff --git a/crates/turtle/db/client-migrations/20230319185725_deleted_at.sql b/crates/turtle/db/client-migrations/20230319185725_deleted_at.sql
new file mode 100644
index 00000000..6c422abc
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20230319185725_deleted_at.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+alter table history add column deleted_at integer;
diff --git a/crates/turtle/db/client-migrations/20260224000100_history_author_intent.sql b/crates/turtle/db/client-migrations/20260224000100_history_author_intent.sql
new file mode 100644
index 00000000..2bed17e9
--- /dev/null
+++ b/crates/turtle/db/client-migrations/20260224000100_history_author_intent.sql
@@ -0,0 +1,2 @@
+alter table history add column author text;
+alter table history add column intent text;
diff --git a/crates/turtle/db/client-record-migrations/20230531212437_create-records.sql b/crates/turtle/db/client-record-migrations/20230531212437_create-records.sql
new file mode 100644
index 00000000..4f4b304a
--- /dev/null
+++ b/crates/turtle/db/client-record-migrations/20230531212437_create-records.sql
@@ -0,0 +1,16 @@
+-- Add migration script here
+create table if not exists records (
+ id text primary key,
+ parent text unique, -- null if this is the first one
+ host text not null,
+
+ timestamp integer not null,
+ tag text not null,
+ version text not null,
+ data blob not null,
+ cek blob not null
+);
+
+create index host_idx on records (host);
+create index tag_idx on records (tag);
+create index host_tag_idx on records (host, tag);
diff --git a/crates/turtle/db/client-record-migrations/20231127090831_create-store.sql b/crates/turtle/db/client-record-migrations/20231127090831_create-store.sql
new file mode 100644
index 00000000..53d78860
--- /dev/null
+++ b/crates/turtle/db/client-record-migrations/20231127090831_create-store.sql
@@ -0,0 +1,15 @@
+-- Add migration script here
+create table if not exists store (
+ id text primary key, -- globally unique ID
+
+ idx integer, -- incrementing integer ID unique per (host, tag)
+ host text not null, -- references the host row
+ tag text not null,
+
+ timestamp integer not null,
+ version text not null,
+ data blob not null,
+ cek blob not null
+);
+
+create unique index record_uniq ON store(host, tag, idx);
diff --git a/crates/turtle/db/server-pg-migrations/20210425153745_create_history.sql b/crates/turtle/db/server-pg-migrations/20210425153745_create_history.sql
new file mode 100644
index 00000000..2c2d17b0
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20210425153745_create_history.sql
@@ -0,0 +1,11 @@
+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/turtle/db/server-pg-migrations/20210425153757_create_users.sql b/crates/turtle/db/server-pg-migrations/20210425153757_create_users.sql
new file mode 100644
index 00000000..a25dcced
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20210425153757_create_users.sql
@@ -0,0 +1,10 @@
+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/turtle/db/server-pg-migrations/20210425153800_create_sessions.sql b/crates/turtle/db/server-pg-migrations/20210425153800_create_sessions.sql
new file mode 100644
index 00000000..c2fb6559
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20210425153800_create_sessions.sql
@@ -0,0 +1,6 @@
+-- Add migration script here
+create table sessions (
+ id bigserial primary key,
+ user_id bigserial,
+ token varchar(128) unique not null
+);
diff --git a/crates/turtle/db/server-pg-migrations/20220419082412_add_count_trigger.sql b/crates/turtle/db/server-pg-migrations/20220419082412_add_count_trigger.sql
new file mode 100644
index 00000000..dd1afa88
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220419082412_add_count_trigger.sql
@@ -0,0 +1,51 @@
+-- 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/turtle/db/server-pg-migrations/20220421073605_fix_count_trigger_delete.sql b/crates/turtle/db/server-pg-migrations/20220421073605_fix_count_trigger_delete.sql
new file mode 100644
index 00000000..6198f300
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220421073605_fix_count_trigger_delete.sql
@@ -0,0 +1,35 @@
+-- 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/turtle/db/server-pg-migrations/20220421174016_larger-commands.sql b/crates/turtle/db/server-pg-migrations/20220421174016_larger-commands.sql
new file mode 100644
index 00000000..0ac43433
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220421174016_larger-commands.sql
@@ -0,0 +1,3 @@
+-- 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/turtle/db/server-pg-migrations/20220426172813_user-created-at.sql b/crates/turtle/db/server-pg-migrations/20220426172813_user-created-at.sql
new file mode 100644
index 00000000..a9138194
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220426172813_user-created-at.sql
@@ -0,0 +1 @@
+alter table users add column created_at timestamp not null default now();
diff --git a/crates/turtle/db/server-pg-migrations/20220505082442_create-events.sql b/crates/turtle/db/server-pg-migrations/20220505082442_create-events.sql
new file mode 100644
index 00000000..57e16ec7
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220505082442_create-events.sql
@@ -0,0 +1,14 @@
+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/turtle/db/server-pg-migrations/20220610074049_history-length.sql b/crates/turtle/db/server-pg-migrations/20220610074049_history-length.sql
new file mode 100644
index 00000000..b1c23016
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20220610074049_history-length.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+alter table history alter column data type text;
diff --git a/crates/turtle/db/server-pg-migrations/20230315220537_drop-events.sql b/crates/turtle/db/server-pg-migrations/20230315220537_drop-events.sql
new file mode 100644
index 00000000..fe3cae17
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20230315220537_drop-events.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+drop table events;
diff --git a/crates/turtle/db/server-pg-migrations/20230315224203_create-deleted.sql b/crates/turtle/db/server-pg-migrations/20230315224203_create-deleted.sql
new file mode 100644
index 00000000..9a9e6263
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20230315224203_create-deleted.sql
@@ -0,0 +1,5 @@
+-- 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/turtle/db/server-pg-migrations/20230515221038_trigger-delete-only.sql b/crates/turtle/db/server-pg-migrations/20230515221038_trigger-delete-only.sql
new file mode 100644
index 00000000..3d0bba52
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20230515221038_trigger-delete-only.sql
@@ -0,0 +1,30 @@
+-- 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/turtle/db/server-pg-migrations/20230623070418_records.sql b/crates/turtle/db/server-pg-migrations/20230623070418_records.sql
new file mode 100644
index 00000000..22437595
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20230623070418_records.sql
@@ -0,0 +1,15 @@
+-- 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/turtle/db/server-pg-migrations/20231202170508_create-store.sql b/crates/turtle/db/server-pg-migrations/20231202170508_create-store.sql
new file mode 100644
index 00000000..ffb57966
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20231202170508_create-store.sql
@@ -0,0 +1,15 @@
+-- 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/turtle/db/server-pg-migrations/20231203124112_create-store-idx.sql b/crates/turtle/db/server-pg-migrations/20231203124112_create-store-idx.sql
new file mode 100644
index 00000000..56d67145
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20231203124112_create-store-idx.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+create unique index record_uniq ON store(user_id, host, tag, idx);
diff --git a/crates/turtle/db/server-pg-migrations/20240108124837_drop-some-defaults.sql b/crates/turtle/db/server-pg-migrations/20240108124837_drop-some-defaults.sql
new file mode 100644
index 00000000..ad2af5a1
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20240108124837_drop-some-defaults.sql
@@ -0,0 +1,4 @@
+-- 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/turtle/db/server-pg-migrations/20240614104159_idx-cache.sql b/crates/turtle/db/server-pg-migrations/20240614104159_idx-cache.sql
new file mode 100644
index 00000000..76425ed7
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20240614104159_idx-cache.sql
@@ -0,0 +1,8 @@
+create table store_idx_cache(
+ id bigserial primary key,
+ user_id bigint,
+
+ host uuid,
+ tag text,
+ idx bigint
+);
diff --git a/crates/turtle/db/server-pg-migrations/20240621110731_user-verified.sql b/crates/turtle/db/server-pg-migrations/20240621110731_user-verified.sql
new file mode 100644
index 00000000..6eba02ec
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20240621110731_user-verified.sql
@@ -0,0 +1,8 @@
+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/turtle/db/server-pg-migrations/20240702094825_idx_cache_index.sql b/crates/turtle/db/server-pg-migrations/20240702094825_idx_cache_index.sql
new file mode 100644
index 00000000..d1a7b194
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20240702094825_idx_cache_index.sql
@@ -0,0 +1 @@
+create unique index store_idx_cache_uniq on store_idx_cache(user_id, host, tag);
diff --git a/crates/turtle/db/server-pg-migrations/20260127000000_remove-email-verification.sql b/crates/turtle/db/server-pg-migrations/20260127000000_remove-email-verification.sql
new file mode 100644
index 00000000..15309920
--- /dev/null
+++ b/crates/turtle/db/server-pg-migrations/20260127000000_remove-email-verification.sql
@@ -0,0 +1,2 @@
+drop table if exists user_verification_token;
+alter table users drop column if exists verified_at;
diff --git a/crates/turtle/db/server-sqlite-migrations/20231203124112_create-store.sql b/crates/turtle/db/server-sqlite-migrations/20231203124112_create-store.sql
new file mode 100644
index 00000000..ca19ed62
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20231203124112_create-store.sql
@@ -0,0 +1,17 @@
+create table store (
+ id text primary key, -- remember to use uuidv7 for happy indices <3
+ client_id text not null, -- I am too uncomfortable with the idea of a client-generated primary key, even though it's fine mathematically
+ host text 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
+);
+
+create unique index record_uniq ON store(user_id, host, tag, idx);
+
diff --git a/crates/turtle/db/server-sqlite-migrations/20240108124830_create-history.sql b/crates/turtle/db/server-sqlite-migrations/20240108124830_create-history.sql
new file mode 100644
index 00000000..7bd653ba
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20240108124830_create-history.sql
@@ -0,0 +1,15 @@
+create table history (
+ id integer primary key autoincrement,
+ 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 text not null, -- store the actual history data, encrypted. I don't wanna know!
+
+ created_at timestamp not null default current_timestamp,
+ deleted_at timestamp
+);
+
+create unique index history_deleted_index on history(client_id, user_id, deleted_at);
+
diff --git a/crates/turtle/db/server-sqlite-migrations/20240108124831_create-sessions.sql b/crates/turtle/db/server-sqlite-migrations/20240108124831_create-sessions.sql
new file mode 100644
index 00000000..3120c35d
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20240108124831_create-sessions.sql
@@ -0,0 +1,6 @@
+create table sessions (
+ id integer primary key autoincrement,
+ user_id integer,
+ token text unique not null
+);
+
diff --git a/crates/turtle/db/server-sqlite-migrations/20240621110730_create-users.sql b/crates/turtle/db/server-sqlite-migrations/20240621110730_create-users.sql
new file mode 100644
index 00000000..852c159d
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20240621110730_create-users.sql
@@ -0,0 +1,12 @@
+create table users (
+ id integer primary key autoincrement, -- also store our own ID
+ username text not null unique, -- being able to contact users is useful
+ email text not null unique, -- being able to contact users is useful
+ password text not null unique,
+ created_at timestamp not null default (datetime('now','localtime')),
+ verified_at timestamp with time zone default null
+);
+
+-- 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/turtle/db/server-sqlite-migrations/20240621110731_create-user-verification-token.sql b/crates/turtle/db/server-sqlite-migrations/20240621110731_create-user-verification-token.sql
new file mode 100644
index 00000000..36eb14de
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20240621110731_create-user-verification-token.sql
@@ -0,0 +1,6 @@
+create table user_verification_token(
+ id integer primary key autoincrement,
+ user_id bigint unique references users(id),
+ token text,
+ valid_until timestamp with time zone
+);
diff --git a/crates/turtle/db/server-sqlite-migrations/20240702094825_create-store-idx-cache.sql b/crates/turtle/db/server-sqlite-migrations/20240702094825_create-store-idx-cache.sql
new file mode 100644
index 00000000..cd54cb18
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20240702094825_create-store-idx-cache.sql
@@ -0,0 +1,10 @@
+create table store_idx_cache(
+ id integer primary key autoincrement,
+ user_id bigint,
+
+ host uuid,
+ tag text,
+ idx bigint
+);
+
+create unique index store_idx_cache_uniq on store_idx_cache(user_id, host, tag);
diff --git a/crates/turtle/db/server-sqlite-migrations/20260127000000_remove-email-verification.sql b/crates/turtle/db/server-sqlite-migrations/20260127000000_remove-email-verification.sql
new file mode 100644
index 00000000..0bde89d7
--- /dev/null
+++ b/crates/turtle/db/server-sqlite-migrations/20260127000000_remove-email-verification.sql
@@ -0,0 +1,2 @@
+drop table if exists user_verification_token;
+alter table users drop column verified_at;
diff --git a/crates/turtle/src/atuin_client/database.rs b/crates/turtle/src/atuin_client/database.rs
index 75b1200c..27f46da5 100644
--- a/crates/turtle/src/atuin_client/database.rs
+++ b/crates/turtle/src/atuin_client/database.rs
@@ -233,7 +233,7 @@ impl Sqlite {
async fn setup_db(pool: &SqlitePool) -> Result<()> {
debug!("running sqlite database setup");
- sqlx::migrate!("./migrations").run(pool).await?;
+ sqlx::migrate!("./db/client-migrations").run(pool).await?;
Ok(())
}
diff --git a/crates/turtle/src/atuin_client/meta.rs b/crates/turtle/src/atuin_client/meta.rs
index 1eea7061..2fbfe275 100644
--- a/crates/turtle/src/atuin_client/meta.rs
+++ b/crates/turtle/src/atuin_client/meta.rs
@@ -61,7 +61,9 @@ impl MetaStore {
.connect_with(opts)
.await?;
- sqlx::migrate!("./meta-migrations").run(&pool).await?;
+ sqlx::migrate!("./db/client-meta-migrations")
+ .run(&pool)
+ .await?;
// Session tokens are stored in this database, so restrict permissions.
#[cfg(unix)]
diff --git a/crates/turtle/src/atuin_client/record/sqlite_store.rs b/crates/turtle/src/atuin_client/record/sqlite_store.rs
index 5fab999d..03f82d13 100644
--- a/crates/turtle/src/atuin_client/record/sqlite_store.rs
+++ b/crates/turtle/src/atuin_client/record/sqlite_store.rs
@@ -66,7 +66,9 @@ impl SqliteStore {
async fn setup_db(pool: &SqlitePool) -> Result<()> {
debug!("running sqlite database setup");
- sqlx::migrate!("./record-migrations").run(pool).await?;
+ sqlx::migrate!("./db/client-record-migrations")
+ .run(pool)
+ .await?;
Ok(())
}
diff --git a/crates/turtle/src/atuin_daemon/mod.rs b/crates/turtle/src/atuin_daemon/mod.rs
index b05eb95c..aff33307 100644
--- a/crates/turtle/src/atuin_daemon/mod.rs
+++ b/crates/turtle/src/atuin_daemon/mod.rs
@@ -14,14 +14,14 @@ pub mod semantic;
pub mod server;
// Re-export core daemon types for convenience
-pub use daemon::{Component, Daemon, DaemonBuilder, DaemonHandle};
+pub use daemon::Daemon;
pub use events::DaemonEvent;
// Re-export components
pub use components::{HistoryComponent, SearchComponent, SemanticComponent, SyncComponent};
// Re-export client helpers
-pub use client::{ControlClient, SemanticClient, emit_event, emit_event_with_settings};
+pub use client::SemanticClient;
/// Boot the daemon using the new component-based architecture.
///
diff --git a/crates/turtle/src/atuin_server/settings.rs b/crates/turtle/src/atuin_server/settings.rs
index f6650af0..2bce0dac 100644
--- a/crates/turtle/src/atuin_server/settings.rs
+++ b/crates/turtle/src/atuin_server/settings.rs
@@ -66,7 +66,7 @@ impl Settings {
config_file.push("server.toml");
// create the config file if it does not exist
- let mut config_builder = Config::builder()
+ let config_builder = Config::builder()
.set_default("host", "127.0.0.1")?
.set_default("port", 8888)?
.set_default("open_registration", false)?
diff --git a/crates/turtle/src/atuin_server_postgres/mod.rs b/crates/turtle/src/atuin_server_postgres/mod.rs
index f506cf25..96bcb7c2 100644
--- a/crates/turtle/src/atuin_server_postgres/mod.rs
+++ b/crates/turtle/src/atuin_server_postgres/mod.rs
@@ -62,7 +62,7 @@ impl Database for Postgres {
))));
}
- sqlx::migrate!("./migrations")
+ sqlx::migrate!("./db/server-pg-migrations")
.run(&pool)
.await
.map_err(|error| DbError::Other(error.into()))?;
diff --git a/crates/turtle/src/atuin_server_sqlite/mod.rs b/crates/turtle/src/atuin_server_sqlite/mod.rs
index 3470a2f1..bc40db3f 100644
--- a/crates/turtle/src/atuin_server_sqlite/mod.rs
+++ b/crates/turtle/src/atuin_server_sqlite/mod.rs
@@ -31,7 +31,7 @@ impl Database for Sqlite {
let pool = SqlitePoolOptions::new().connect_with(opts).await?;
- sqlx::migrate!("./migrations")
+ sqlx::migrate!("./db/server-sqlite-migrations")
.run(&pool)
.await
.map_err(|error| DbError::Other(error.into()))?;
diff --git a/flake.nix b/flake.nix
index 66c34eb1..6e798d37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,20 +32,6 @@
pkgs.cargo-flamegraph
];
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
-
- shellHook = ''
- echo >&2 "Setting development database path"
- export ATUIN_DB_PATH="/tmp/atuin_dev.db"
- export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
-
- if [ -e "''${ATUIN_DB_PATH}" ]; then
- echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
- fi
-
- if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
- echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
- fi
- '';
});
};
}