Skip to content

Business intelligence made simple

Improved error message if table already exists

Andrew Kaned09e433558e0
diff --git a/app/controllers/blazer/uploads_controller.rb b/app/controllers/blazer/uploads_controller.rb
index 7318b964..a137d380 100644
--- a/app/controllers/blazer/uploads_controller.rb
+++ b/app/controllers/blazer/uploads_controller.rb
@@ -111,13 +111,18 @@ module Blazer
end
end
- # maybe SET LOCAL statement_timeout = '30s'
- Blazer.uploads_connection.transaction do
- Blazer.uploads_connection.execute("DROP TABLE IF EXISTS #{Blazer.uploads_table_name(drop)}") if drop
- Blazer.uploads_connection.execute("CREATE TABLE #{upload.table_name} (#{columns.map.with_index { |c, i| "#{Blazer.uploads_connection.quote_column_name(c)} #{column_types[i]}" }.join(", ")})")
- Blazer.uploads_connection.raw_connection.copy_data("COPY #{upload.table_name} FROM STDIN CSV HEADER") do
- Blazer.uploads_connection.raw_connection.put_copy_data(contents)
+ begin
+ # maybe SET LOCAL statement_timeout = '30s'
+ Blazer.uploads_connection.transaction do
+ Blazer.uploads_connection.execute("DROP TABLE IF EXISTS #{Blazer.uploads_table_name(drop)}") if drop
+ Blazer.uploads_connection.execute("CREATE TABLE #{upload.table_name} (#{columns.map.with_index { |c, i| "#{Blazer.uploads_connection.quote_column_name(c)} #{column_types[i]}" }.join(", ")})")
+ Blazer.uploads_connection.raw_connection.copy_data("COPY #{upload.table_name} FROM STDIN CSV HEADER") do
+ Blazer.uploads_connection.raw_connection.put_copy_data(contents)
+ end
end
+ rescue ActiveRecord::StatementInvalid => e
+ raise Blazer::UploadError, "Table already exists" if e.message.include?("PG::DuplicateTable")
+ raise e
end
end