add log and post postgres repos.

database/postgres/queries/changes.sql

@@ -3,19 +3,19 @@ SELECT * FROM data_change WHERE id = $1 LIMIT 1;
 
 -- name: SelectChanges :many
 SELECT * FROM data_change
-WHERE (sqlc.arg(filter_keys)::bool = false OR keys && (sqlc.arg(keys)::text[]))
-  AND (sqlc.arg(filter_earliest_date)::bool = false OR date >= sqlc.arg(earliest_date)::timestamp)
-  AND (sqlc.arg(filter_latest_date)::bool = false OR date <= sqlc.arg(latest_date)::timestamp)
-  AND (sqlc.arg(filter_author)::bool = false OR author = sqlc.arg(author)::text)
+WHERE (@filter_keys::bool = false OR keys && (@keys::text[]))
+  AND (@filter_earliest_date::bool = false OR date >= @earliest_date::timestamp)
+  AND (@filter_latest_date::bool = false OR date <= @latest_date::timestamp)
+  AND (@filter_author::bool = false OR author = @author::text)
 ORDER BY date DESC
-LIMIT sqlc.arg(limit_size)::int;
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: InsertChange :exec
 INSERT INTO data_change (id, model, op, author, listed, date, keys, objects)
 VALUES (
-    sqlc.arg(id)::text, sqlc.arg(model)::text, sqlc.arg(op)::text, sqlc.arg(author)::text,
-    sqlc.arg(listed)::boolean, sqlc.arg(date)::timestamp, sqlc.arg(keys)::text[],
-    sqlc.arg(objects)::jsonb
+    @id::text, @model::text, @op::text, @author::text,
+    @listed::boolean, @date::timestamp, @keys::text[],
+    @objects::jsonb
 );
 
 -- name: DeleteChange :exec

database/postgres/queries/channels.sql

@@ -4,27 +4,27 @@ SELECT * FROM data_channel WHERE name = $1 LIMIT 1;
 -- name: InsertChannel :exec
 INSERT INTO data_channel (name, logged, hub, event_name, location_name)
 VALUES (
-    sqlc.arg(name)::text,
-    sqlc.arg(logged)::boolean, sqlc.arg(hub)::boolean,
-    sqlc.arg(event_name)::text, sqlc.arg(location_name)::text
+    @name::text,
+    @logged::boolean, @hub::boolean,
+    @event_name::text, @location_name::text
 );
 
 -- name: SelectChannels :many
 SELECT * FROM data_channel
-WHERE (sqlc.arg(filter_name)::bool = false OR name = ANY(sqlc.arg(names)::text[]))
-  AND (sqlc.arg(filter_logged)::bool = false OR logged = sqlc.arg(logged))
-  AND (sqlc.arg(filter_event_name)::bool = false OR event_name = sqlc.arg(event_name))
-  AND (sqlc.arg(filter_location_name)::bool = false OR location_name = sqlc.arg(location_name))
+WHERE (@filter_name::bool = false OR name = ANY(@names::text[]))
+  AND (@filter_logged::bool = false OR logged = @logged)
+  AND (@filter_event_name::bool = false OR event_name = @event_name)
+  AND (@filter_location_name::bool = false OR location_name = @location_name)
 ORDER BY name
-LIMIT sqlc.arg(limit_size)::int;
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: UpdateChannel :exec
 UPDATE data_channel
-SET logged=sqlc.arg(logged)::boolean,
-    hub=sqlc.arg(hub)::boolean,
-    event_name=sqlc.arg(event_name)::text,
-    location_name=sqlc.arg(location_name)::text
-WHERE name=sqlc.arg(name)::text;
+SET logged = @logged::boolean,
+    hub = @hub::boolean,
+    event_name = @event_name::text,
+    location_name = @location_name::text
+WHERE name = @name::text;
 
 -- name: DeleteChannel :exec
 DELETE FROM data_channel WHERE name=$1;

database/postgres/queries/chapters.sql

@@ -2,7 +2,10 @@
 SELECT * FROM story_chapter WHERE id=$1::TEXT LIMIT 1;
 
 -- name: SelectChapters :many
-SELECT * FROM story_chapter WHERE (sqlx.arg(story_id)::TEXT == '' OR story_id = @story_id::TEXT) ORDER BY created_date LIMIT @limit_size;
+SELECT * FROM story_chapter
+WHERE (sqlx.arg(story_id)::TEXT == '' OR story_id = @story_id::TEXT)
+ORDER BY created_date
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: InsertChapter :exec
 INSERT INTO story_chapter (id, story_id, title, author, source, created_date, fictional_date, edited_date, comment_mode, comments_locked)

database/postgres/queries/characters.sql

@@ -14,7 +14,7 @@ WHERE (@filter_id::bool = false OR id = ANY(@ids::text[]))
     AND (@filter_nick::bool = false OR nicks && (@nicks::text[]))
     AND (@filter_author::bool = false OR author = @author::text)
     AND (@filter_search::bool = false OR "ts_vector" @@ to_tsquery(@search::text))
-LIMIT @limit_size::int;
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: InsertCharacter :exec
 INSERT INTO data_character (id, nicks, name, short_name, author, description, ts_vector) VALUES (

database/postgres/queries/comments.sql

@@ -19,7 +19,9 @@ SET subject = @subject,
 WHERE id = @id;
 
 -- name: SelectComments :many
-SELECT * FROM story_comment WHERE (@chapter_id = '' OR chapter_id = @chapter_id) LIMIT @limit_size;
+SELECT * FROM story_comment
+WHERE (@chapter_id = '' OR chapter_id = @chapter_id)
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: DeleteComment :exec
 DELETE FROM story_comment WHERE id = $1;

database/postgres/queries/counter.sql

@@ -1,8 +1,8 @@
 -- name: EnsureCounter :exec
-INSERT INTO core_counter (id, value) VALUES ($1::text, 0) ON CONFLICT DO NOTHING;
+INSERT INTO core_counter (id, value) VALUES (@id::text, 0) ON CONFLICT DO NOTHING;
 
 -- name: IncrementCounter :one
-UPDATE core_counter SET value = value + 1 WHERE id = $1::text RETURNING value::int;
+UPDATE core_counter SET value = value + 1 WHERE id = @id::text RETURNING value::int;
 
 -- name: BumpCounter :exec
-UPDATE core_counter SET value = value + 1 WHERE id = sqlc.arg(id)::text AND value <= sqlc.arg(value)::int;
+UPDATE core_counter SET value = value + 1 WHERE id = @id::text AND value <= @value::int;

database/postgres/queries/logs.sql

@@ -0,0 +1,32 @@
+-- name: SelectLog :one
+SELECT * FROM log WHERE id=$1 OR short_id=$1 LIMIT 1;
+
+-- name: SelectLogs :many
+SELECT * FROM log
+WHERE (@filter_short_id::BOOL = false OR short_id = ANY(@short_ids::TEXT[]))
+  AND (@filter_character_id::BOOL = false OR character_ids && (@character_ids::TEXT[]))
+  AND (@filter_channel_name::BOOL = false OR channel_name = ANY(@channel_names::TEXT[]))
+  AND (@filter_event_name::BOOL = false OR event_name = ANY(@event_names::TEXT[]))
+  AND (@filter_open::BOOL = false OR open = @open::BOOL)
+  AND (@filter_earlist_date::BOOL = false OR date >= @earliest_date::TIMESTAMP)
+  AND (@filter_lastest_date::BOOL = false OR date <= @latest_date::TIMESTAMP)
+ORDER BY date
+LIMIT NULLIF(@limit_size::INT, 0);
+
+-- name: InsertLog :exec
+INSERT INTO log (id, short_id, character_ids, date, channel_name, event_name, title, description, open)
+VALUES (
+   @id, @short_id, @character_ids, @date, @channel_name, @event_name, @title, @description, @open
+);
+
+-- name: UpdateLog :exec
+UPDATE log
+SET title = @title,
+    event_name = @event_name,
+    description = @description,
+    open = @open,
+    character_ids = @character_ids
+WHERE id = @id;
+
+-- name: DeleteLog :exec
+DELETE FROM log WHERE id=$1;

database/postgres/queries/posts.sql

@@ -0,0 +1,60 @@
+-- name: SelectPost :one
+SELECT * FROM log_post WHERE id=$1 LIMIT 1;
+
+-- name: SelectLogIDsFromPostSearch :many
+SELECT DISTINCT(log_short_id) FROM log_post WHERE "ts_vector" @@ to_tsquery(@search::TEXT);
+
+-- name: SelectPostsByPositionRange :many
+SELECT * FROM log_post WHERE log_short_id = @log_short_id AND position >= @from_position AND position = @to_position;
+
+-- name: SelectPosts :many
+SELECT * FROM log_post
+WHERE (@filter_ids::BOOL = false OR id = ANY(@ids::TEXT[]))
+  AND (@filter_kinds::BOOL = false OR kind = ANY(@kinds::TEXT[]))
+  AND (@filter_log_short_id::BOOL = false OR log_short_id = @log_short_id)
+  AND (@filter_search::BOOL = false OR "ts_vector" @@ to_tsquery(@search::TEXT))
+ORDER BY log_short_id, position
+LIMIT NULLIF(@limit_size::INT, 0);
+
+-- name: InsertPost :one
+INSERT INTO log_post (id, log_short_id, time, kind, nick, text, position, ts_vector)
+    SELECT @id, @log_short_id, @time, @kind, @nick, @text, COALESCE(MAX(position), 0)+1, to_tsvector(@nick || ' ' || @text)
+    FROM log_post
+    WHERE log_short_id=@log_short_id
+RETURNING position;
+
+-- name: InsertPosts :one
+INSERT INTO log_post (id, log_short_id, time, kind, nick, text, position, ts_vector)
+    SELECT UNNEST(@ids::TEXT[]), @log_short_id, UNNEST(@times::TIMESTAMP[]), UNNEST(@kinds::TEXT[]),
+           UNNEST(@nicks::TEXT[]), UNNEST(@texts::TEXT[]), COALESCE(MAX(position), 1) + UNNEST(@offsets::INT[]),
+           to_tsvector(UNNEST(@nicks::TEXT[]) || ' ' || UNNEST(@texts::TEXT[]))
+    FROM log_post
+    WHERE log_short_id = @log_short_id
+RETURNING position;
+
+-- name: UpdatePost :exec
+UPDATE log_post
+SET time = @time,
+    kind = @kind,
+    nick = @nick,
+    text = @text,
+    ts_vector = to_tsvector(@nick || ' ' || @text)
+WHERE id = @id;
+
+-- name: MovePost :exec
+UPDATE log_post SET position = @position WHERE id = @id;
+
+-- name: ShiftPostsBetween :exec
+UPDATE log_post SET position = position + @shift_offset::INT WHERE log_short_id = @log_short_id AND position >= @from_position AND position <= @to_position;
+
+-- name: ShiftPostsAfter :exec
+UPDATE log_post SET position = position + @shift_offset::INT WHERE log_short_id = @log_short_id AND position >= @from_position;
+
+-- name: ShiftPostsBefore :exec
+UPDATE log_post SET position = position + @shift_offset::INT WHERE log_short_id = @log_short_id AND position <= @to_position;
+
+-- name: DeletePost :exec
+DELETE FROM log_post WHERE id = @id;
+
+-- name: DeletePostsByLogShortID :exec
+DELETE FROM log_post WHERE log_short_id = @log_short_id;

database/postgres/queries/stories.sql

@@ -3,35 +3,35 @@ SELECT * FROM story WHERE id = $1 LIMIT 1;
 
 -- name: SelectStories :many
 SELECT * FROM story
-WHERE (sqlc.arg(filter_id)::bool = false OR id = ANY(sqlc.arg(ids)::text[]))
-  AND (sqlc.arg(filter_author)::bool = false OR name = sqlc.arg(author)::text)
-  AND (sqlc.arg(filter_earlist_fictional_date)::bool = false OR fictional_date >= sqlc.arg(earliest_fictional_date)::timestamp)
-  AND (sqlc.arg(filter_lastest_fictional_date)::bool = false OR fictional_date <= sqlc.arg(latest_fictional_date)::timestamp)
-  AND (sqlc.arg(filter_category)::bool = false OR category = sqlc.arg(category)::text)
-  AND (sqlc.arg(filter_open)::bool = false OR open = sqlc.arg(open)::bool)
-  AND (sqlc.arg(filter_unlisted)::bool = false OR unlisted = sqlc.arg(unlisted)::bool)
+WHERE (@filter_id::bool = false OR id = ANY(@ids::text[]))
+  AND (@filter_author::bool = false OR name = @author::text)
+  AND (@filter_earlist_fictional_date::bool = false OR fictional_date >= @earliest_fictional_date::timestamp)
+  AND (@filter_lastest_fictional_date::bool = false OR fictional_date <= @latest_fictional_date::timestamp)
+  AND (@filter_category::bool = false OR category = @category::text)
+  AND (@filter_open::bool = false OR open = @open::bool)
+  AND (@filter_unlisted::bool = false OR unlisted = @unlisted::bool)
 ORDER BY updated_date
-LIMIT sqlc.arg(limit_size)::int;
+LIMIT NULLIF(@limit_size::INT, 0);
 
 -- name: InsertStory :exec
 INSERT INTO story (id, author, name, category, open, listed, sort_by_fictional_date, created_date, fictional_date, updated_date)
 VALUES (
-    sqlc.arg(id)::text, sqlc.arg(author)::text, sqlc.arg(name)::text, sqlc.arg(category)::text,
-    sqlc.arg(open)::boolean, sqlc.arg(listed)::boolean, sqlc.arg(sort_by_fictional_date)::boolean,
-    sqlc.arg(created_date)::timestamp, sqlc.arg(fictional_date)::timestamp, sqlc.arg(updated_date)::timestamp
+    @id::text, @author::text, @name::text, @category::text,
+    @open::boolean, @listed::boolean, @sort_by_fictional_date::boolean,
+    @created_date::timestamp, @fictional_date::timestamp, @updated_date::timestamp
 );
 
 -- name: UpdateStory :exec
 UPDATE story
-SET name=sqlc.arg(name),
-    category=sqlc.arg(category),
-    author=sqlc.arg(author),
-    open=sqlc.arg(open),
-    listed=sqlc.arg(listed),
-    fictional_date=sqlc.arg(fictional_date),
-    updated_date=sqlc.arg(updated_date),
-    sort_by_fictional_date=sqlc.arg(sort_by_fictional_date)
-WHERE id=sqlc.arg(id);
+SET name = @name,
+    category = @category,
+    author = @author,
+    open = @open,
+    listed = @listed,
+    fictional_date = @fictional_date,
+    updated_date = @updated_date,
+    sort_by_fictional_date = @sort_by_fictional_date
+WHERE id = @id;
 
 -- name: DeleteStory :exec
 DELETE FROM story WHERE id=$1;

database/postgres/queries/tags.sql

@@ -1,31 +1,44 @@
 -- name: SetTag :exec
 INSERT INTO common_tag (tag, target_kind, target_id)
 VALUES (
-    sqlc.arg(tag)::TEXT, sqlc.arg(target_kind)::TEXT, sqlc.arg(target_id)::TEXT
+    @tag::TEXT, @target_kind::TEXT, @target_id::TEXT
 )
 ON CONFLICT DO NOTHING;
 
 -- name: SetTags :exec
 INSERT INTO common_tag (tag, target_kind, target_id)
-SELECT unnest(sqlc.arg(tags)::TEXT[]), sqlc.arg(target_kind)::TEXT as target_kind, sqlc.arg(target_id)::TEXT as target_id
+SELECT unnest(@tags::TEXT[]), @target_kind::TEXT as target_kind, @target_id::TEXT as target_id
 ON CONFLICT DO NOTHING;
 
 -- name: ClearTag :exec
 DELETE FROM common_tag
-WHERE tag=sqlc.arg(tag)::TEXT
-  AND target_kind=sqlc.arg(target_kind)::TEXT
-  AND target_id=sqlc.arg(target_id)::TEXT;
+WHERE tag = @tag::TEXT
+  AND target_kind = @target_kind::TEXT
+  AND target_id = @target_id::TEXT;
 
 -- name: ClearTagsByTargetLike :exec
 DELETE FROM common_tag
-WHERE target_kind=sqlc.arg(target_kind)::TEXT
-  AND target_id=sqlc.arg(target_id)::TEXT
-  AND tag LIKE sqlc.arg(tag_like)::TEXT;
+WHERE target_kind = @target_kind::TEXT
+  AND target_id = @target_id::TEXT
+  AND tag LIKE @tag_like::TEXT;
 
 -- name: ClearTagsByTarget :exec
 DELETE FROM common_tag
-WHERE target_kind=sqlc.arg(target_kind)::TEXT
-  AND target_id=sqlc.arg(target_id)::TEXT;
+WHERE target_kind = @target_kind::TEXT
+  AND target_id = @target_id::TEXT;
+
+-- name: SetCharacterTagsFromIDs :exec
+INSERT INTO common_tag
+SELECT 'Character:'||name AS tag, @target_kind::TEXT as target_kind, @target_id::TEXT as target_id
+FROM data_character WHERE id = ANY(@character_ids::TEXT[])
+ON CONFLICT DO NOTHING;
+
+-- name: SetLocationTagFromChannelName :exec
+INSERT INTO common_tag
+SELECT 'Location:'||location_name AS tag, @target_kind::TEXT as target_kind, @target_id::TEXT as target_id
+FROM data_channel
+WHERE name = @channel_name AND location_name != ''
+ON CONFLICT DO NOTHING;
 
 -- name: SelectDistinctTags :many
 SELECT DISTINCT tag FROM common_tag ORDER BY tag;
@@ -34,16 +47,16 @@ SELECT DISTINCT tag FROM common_tag ORDER BY tag;
 SELECT DISTINCT tag FROM common_tag WHERE tag LIKE $1::text ORDER BY tag;
 
 -- name: SelectTagsByTag :many
-SELECT * FROM common_tag WHERE tag = sqlc.arg(tag_name)::text ORDER BY tag;
+SELECT * FROM common_tag WHERE tag = @tag_name::text ORDER BY tag;
 
 -- name: SelectTagsByTags :many
-SELECT * FROM common_tag WHERE tag = ANY(sqlc.arg(tag_names)::text[]) ORDER BY tag;
+SELECT * FROM common_tag WHERE tag = ANY(@tag_names::text[]) ORDER BY tag;
 
 -- name: SelectTargetsByTags :many
-SELECT DISTINCT(target_id) FROM common_tag WHERE tag = ANY(sqlc.arg(tag_names)::text[]) AND target_kind = sqlc.arg(target_kind)::text ORDER BY tag;
+SELECT DISTINCT(target_id) FROM common_tag WHERE tag = ANY(@tag_names::text[]) AND target_kind = @target_kind::text ORDER BY tag;
 
 -- name: SelectTagsByTarget :many
-SELECT * FROM common_tag WHERE target_kind = sqlc.arg(target_kind) AND target_id = sqlc.arg(target_id)::text ORDER BY tag;
+SELECT * FROM common_tag WHERE target_kind = @target_kind AND target_id = @target_id::text ORDER BY tag;
 
 -- name: SelectTagsByTargets :many
-SELECT * FROM common_tag WHERE target_kind = sqlc.arg(target_kind) AND target_id = ANY(sqlc.arg(target_ids)::text[]) ORDER BY tag;
+SELECT * FROM common_tag WHERE target_kind = @target_kind AND target_id = ANY(@target_ids::text[]) ORDER BY tag;