blazer 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22ffd3b33bca8c53e32df849e161eaf654cc480b75ee09d4c1eba5a2728b2d1
-  data.tar.gz: 604d3ec2f9bc97ad85aef289392306132a6e8fd165f11f0b099a6219d40bd0c9
+  metadata.gz: 71bd121d2bace5612677090372e36ebdd89eb09398bd7510ba38c666351c1eb4
+  data.tar.gz: 4b109076d6af5aee545f4c19311b431feb68bc7e31f45e28704a99fe7692595b
 SHA512:
-  metadata.gz: 001d81b65da57fc18c62579df60864715ce6073bc1328696dd2d9c2b3dd14c3087ea9151c8676e853eaf5c7b705896ceab93db2a77e6703cdaffd7742e9b05dd
-  data.tar.gz: f7ad912b5bb3114f8d74eba474f394b4962d46a51c4f01a6d360c44da2e19943ebf17fd82a61dc3d2c0e8dbbee311ba6153a4d7fae3d3e2541a44b90f580db7b
+  metadata.gz: 035bcb0b2252cd10514b5ab3f28c78b4ae6b6b6b534d99948f20815076661cf7fe85200debcf64ab11c6e5307fc24c326daea76f361f6c474e8216b69ebbbe35
+  data.tar.gz: 4838d7ee13b888d005602916d309825f716cd868287b0f1843aa92bf1a96d5f43168f22de3430c7b2ba6b4ab25fc71e1ee6bd6b45588729c0a1b44897d508052

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.1 (2020-11-23)
+
+- Improved column names for uploads
+
 ## 2.3.0 (2020-11-16)
 
 - Added support for archiving queries

data/README.md

@@ -456,12 +456,10 @@ Commit and deploy away. The first deploy may take a few minutes.
 
 ## Forecasting
 
-Blazer has experimental support for two different forecasting methods.
+Blazer has experimental support for two different forecasting methods. [Example](https://blazer.dokkuapp.com/queries/18-forecast?forecast=t)
 
 A forecast link will appear for queries that return 2 columns with types timestamp and numeric.
 
-[Example](https://blazer.dokkuapp.com/queries/18-forecast?forecast=t)
-
 ### Prophet
 
 Add [prophet](https://github.com/ankane/prophet) to your Gemfile:
@@ -494,7 +492,9 @@ forecasting: trend
 
 ## Uploads
 
-Blazer has experimental support for creating database tables from CSV files. Run:
+Blazer has experimental support for creating database tables from CSV files. [Example](https://blazer.dokkuapp.com/uploads)
+
+Run:
 
 ```sh
 rails generate blazer:uploads
@@ -510,7 +510,7 @@ uploads:
   data_source: main
 ```
 
-This feature requires PostgreSQL. Create a new schema just for uploads to ensure existing tables aren’t overwritten.
+This feature requires PostgreSQL. Create a new schema just for uploads.
 
 ```sql
 CREATE SCHEMA uploads;

data/app/controllers/blazer/uploads_controller.rb

@@ -93,7 +93,12 @@ module Blazer
 
         contents = file.read
         rows = CSV.parse(contents, converters: %i[numeric date date_time])
-        columns = rows.shift.map(&:to_s)
+
+        # friendly column names
+        columns = rows.shift.map { |v| v.to_s.encode("UTF-8").gsub("%", " pct ").parameterize.gsub("-", "_") }
+        duplicate_column = columns.find { |c| columns.count(c) > 1 }
+        raise Blazer::UploadError, "Duplicate column name: #{duplicate_column}" if duplicate_column
+
         column_types =
           columns.size.times.map do |i|
             values = rows.map { |r| r[i] }.uniq.compact
@@ -110,13 +115,19 @@ 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'
+          # maybe regenerate CSV in Ruby to ensure consistent parsing
+          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
 

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties