Move double-deletion check up to GhostTableManager

pull/12015/head
Javier Torres 8 years ago
parent c9deaf4f61
commit 3beb983723

@ -59,7 +59,7 @@ module Carto
before_destroy :ensure_not_viewer
before_destroy :cache_dependent_visualizations, unless: :destroyed?
after_destroy :destroy_dependent_visualizations
after_destroy { CartoDB::Logger.debug(message: "Carto::UserTable#after_destroy"); service.after_destroy }
after_destroy { service.after_destroy }
def geometry_types
@geometry_types ||= service.geometry_types

@ -484,7 +484,7 @@ class Table
def after_destroy
Tag.filter(user_id: user_id, table_id: id).delete
remove_table_from_stats if owner
remove_table_from_stats
cache.del geometry_types_key

@ -261,10 +261,11 @@ module Carto
table_name: name,
table_id: id)
table_to_drop = ::Table.new(user_table: user.tables.where(table_id: id, name: name).first)
user_table_to_drop = user.tables.where(table_id: id, name: name).first
return unless user_table_to_drop # The table has already been deleted
table_to_drop = ::Table.new(user_table: user_table_to_drop)
table_to_drop.keep_user_database_table = true
table_to_drop.destroy
rescue => exception
CartoDB::Logger.error(message: 'Ghost tables: Error dropping Table',

Loading…
Cancel
Save