Skip to content

Commit

Permalink
Merge pull request #11173 from opf/fix/journal-id-deletion
Browse files Browse the repository at this point in the history
Do not delete data journal id, but journal_id reference
  • Loading branch information
ulferts committed Aug 18, 2022
2 parents fa8d54a + 6a18f80 commit 4d827df
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions app/services/journals/create_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -177,22 +177,25 @@ def create_journal_sql(predecessor, notes)
def cleanup_predecessor_data(predecessor)
cleanup_predecessor(predecessor,
data_table_name,
:id)
:id,
:data_id)
end

def cleanup_predecessor_attachable(predecessor)
cleanup_predecessor(predecessor,
'attachable_journals',
:journal_id)
:journal_id,
:id)
end

def cleanup_predecessor_customizable(predecessor)
cleanup_predecessor(predecessor,
'customizable_journals',
:journal_id)
:journal_id,
:id)
end

def cleanup_predecessor(predecessor, table_name, column)
def cleanup_predecessor(predecessor, table_name, column, referenced_id)
return "SELECT 1" unless predecessor

sql = <<~SQL
Expand All @@ -204,7 +207,7 @@ def cleanup_predecessor(predecessor, table_name, column)
SQL

sanitize sql,
column => predecessor.id
column => predecessor.send(referenced_id)
end

def update_or_insert_journal_sql(predecessor, notes)
Expand Down

0 comments on commit 4d827df

Please sign in to comment.