mirror/pasty
1
0
Fork 0
mirror of https://github.com/lus/pasty.git synced 2023-08-10 21:13:09 +03:00
Code Issues Projects Releases Wiki Activity

Remove the paste-specific autoDelete field

Browse Source
This commit is contained in:
Lukas Schulte Pelkum
2021-07-30 21:51:33 +02:00
parent 4f3b5b193b
commit 1818fac196
12 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/storage/postgres/migrations/000004_remove_paste_specific_autodelete.down.sql Normal file
View File

@@ -0,0 +1,5 @@
begin;
alter table if exists "pastes" add column "autoDelete" boolean;
commit;

5
internal/storage/postgres/migrations/000004_remove_paste_specific_autodelete.up.sql Normal file
View File

@@ -0,0 +1,5 @@
begin;
alter table if exists "pastes" drop column "autoDelete";
commit;

11
internal/storage/postgres/postgres_driver.go
View File

@@ -82,7 +82,7 @@ func (driver *PostgresDriver) Get(id string) (*shared.Paste, error) {
row := driver.pool.QueryRow(context.Background(), query, id)
paste := new(shared.Paste)
if err := row.Scan(&paste.ID, &paste.Content, &paste.ModificationToken, &paste.Created, &paste.AutoDelete, &paste.Metadata); err != nil {
if err := row.Scan(&paste.ID, &paste.Content, &paste.ModificationToken, &paste.Created, &paste.Metadata); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, nil
}
@@ -94,17 +94,16 @@ func (driver *PostgresDriver) Get(id string) (*shared.Paste, error) {
// Save saves a paste
func (driver *PostgresDriver) Save(paste *shared.Paste) error {
query := `
INSERT INTO pastes (id, content, "modificationToken", created, "autoDelete", metadata)
VALUES ($1, $2, $3, $4, $5, $6)
INSERT INTO pastes (id, content, "modificationToken", created, metadata)
VALUES ($1, $2, $3, $4, $5)
ON CONFLICT (id) DO UPDATE
SET content = excluded.content,
"modificationToken" = excluded."modificationToken",
created = excluded.created,
"autoDelete" = excluded."autoDelete",
metadata = excluded.metadata
`
_, err := driver.pool.Exec(context.Background(), query, paste.ID, paste.Content, paste.ModificationToken, paste.Created, paste.AutoDelete, paste.Metadata)
_, err := driver.pool.Exec(context.Background(), query, paste.ID, paste.Content, paste.ModificationToken, paste.Created, paste.Metadata)
return err
}
@@ -118,7 +117,7 @@ func (driver *PostgresDriver) Delete(id string) error {
// Cleanup cleans up the expired pastes
func (driver *PostgresDriver) Cleanup() (int, error) {
query := "DELETE FROM pastes WHERE autoDelete = true AND created < $2"
query := "DELETE FROM pastes WHERE created < $2"
tag, err := driver.pool.Exec(context.Background(), query, time.Now().Add(-config.Current.AutoDelete.Lifetime).Unix())
if err != nil {