lib/ab_admin/utils/mysql.rb in ab_admin-0.9.0 vs lib/ab_admin/utils/mysql.rb in ab_admin-0.10.0

- old
+ new

@@ -12,16 +12,15 @@ transaction { connection.execute("TRUNCATE TABLE #{quoted_table_name};") } end # remove duplicate records by columns def remove_duplicates(*cols, deleted_id_order: '<') - conds = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ') + condition_sql = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ') query = <<-SQL - DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{conds} + DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{condition_sql} SQL connection.execute(query) end - # Disables key updates for model table def disable_keys connection.execute("ALTER TABLE #{quoted_table_name} DISABLE KEYS") end