evt-view_data-pg 0.1.0.1 → 0.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b27d94186a93683a4871c644451ce578293d2214b002cd13f5ba9fd0a1ed883
-  data.tar.gz: 3fb9a847d458bb20cfb36a299a9b97e1f68dec508f9cff30181b94870662a176
+  metadata.gz: abf02a0175c8df7c00c21058b526ae1846fa9306a1b65b01bd3e7942472f0b71
+  data.tar.gz: a1073755eec78072f1e2f532f9a102cf225b929d7f5da636e40c366e3253bf19
 SHA512:
-  metadata.gz: de96e8bdbe484b0a3c73da8641373efad8e17f9c98e785b4da3600f9361a413627426fd9a0bf37dc4e8e93f217942cc19bc40a8a29cf3660139cc34900b07bd9
-  data.tar.gz: 10514d4b802e3f5477e966c917c29ec0436a8fe870f06546cc4e28d328b979916164411ea1df321b9ab7d2cab01e0c4e87e490fa43be254137aaa54310039dc3
+  metadata.gz: f0b7ec8c85371cdb78cbcc8c5402f066509d8dfd5d6c36dd0657c064949af39549eb5aa3243573f2175ac2791e0a69eafdd1a42c2f01d2396dfb6b52c3bc3fe7
+  data.tar.gz: aa53afe9ebb2a32fe5b837f054941529424d7dbeda2ac981c2121bf22a4d8fa36915062bf9de3817032d81b36d825a93f2dad55f599b107dff4fed6707f8fc57

data/lib/view_data/pg/controls/table/all_data_types.rb

@@ -8,7 +8,7 @@ module ViewData
 
             if drop
               session.execute("DROP TABLE IF EXISTS #{name}")
-              session.execute("DROP TYPE some_enum_type")
+              session.execute("DROP TYPE IF EXISTS some_enum_type")
             end
 
             begin

data/lib/view_data/pg/handler.rb

@@ -6,7 +6,7 @@ module ViewData
 
       include ViewData::Commands
 
-      dependency :session, MessageStore::Postgres::Session
+      dependency :session, Session
       dependency :get_primary_key_columns, PrimaryKey::GetColumns
 
       def configure
@@ -27,6 +27,10 @@ module ViewData
 
         columns = pkey_columns + data_columns
 
+        quoted_columns = columns.map do |column|
+          quote_column(column)
+        end
+
         values = pkey_values + data_values
 
         values_clause = values.count.times.map do |i|
@@ -34,7 +38,7 @@ module ViewData
         end
 
         statement = <<~SQL.chomp
-          INSERT INTO #{table_name} (#{columns * ', '})
+          INSERT INTO #{quote_table_name(table_name)} (#{quoted_columns * ', '})
           VALUES (#{values_clause * ', '})
         SQL
 
@@ -64,22 +68,26 @@ module ViewData
         data_columns = update.data.keys
         data_values = update.data.values
 
-        set_clause = data_columns.map.with_index do |column_name, index|
+        set_clause = data_columns.map.with_index do |column, index|
+          quoted_column = quote_column(column)
+
           reference = index + 1
 
-          "#{column_name} = $#{reference}"
+          "#{quoted_column} = $#{reference}"
         end
 
-        pkey_clause = pkey_columns.map.with_index do |column_name, index|
+        pkey_clause = pkey_columns.map.with_index do |column, index|
+          quoted_column = quote_column(column)
+
           reference = index + data_columns.count + 1
 
-          "#{column_name} = $#{reference}"
+          "#{quoted_column} = $#{reference}"
         end
 
         values = data_values + pkey_values
 
         statement = <<~SQL.chomp
-          UPDATE #{table_name}
+          UPDATE #{quote_table_name(table_name)}
           SET #{set_clause * ', '}
           WHERE #{pkey_clause * ' AND '}
         SQL
@@ -103,14 +111,16 @@ module ViewData
         pkey_columns = get_primary_key_columns.(table_name)
         pkey_values = Array(delete.identifier)
 
-        pkey_clause = pkey_columns.map.with_index do |column_name, index|
+        pkey_clause = pkey_columns.map.with_index do |column, index|
+          quoted_column = quote_column(column)
+
           reference = index + 1
 
-          "#{column_name} = $#{reference}"
+          "#{quoted_column} = $#{reference}"
         end
 
         statement = <<~SQL.chomp
-          DELETE FROM #{table_name}
+          DELETE FROM #{quote_table_name(table_name)}
           WHERE #{pkey_clause * ' AND '}
         SQL
 
@@ -124,6 +134,14 @@ module ViewData
         logger.info(tag: :data) { "SQL: #{statement}" }
         logger.info(tag: :data) { pkey_values.pretty_inspect }
       end
+
+      def quote_column(column)
+        session.connect.quote_ident(column.to_s)
+      end
+
+      def quote_table_name(name)
+        session.connect.quote_ident(name.to_s.split('.'))
+      end
     end
   end
 end

data/lib/view_data/pg/primary_key/get_columns.rb

@@ -2,8 +2,8 @@ module ViewData
   module PG
     module PrimaryKey
       class GetColumns
-        Configure.activate(self)
-        Dependency.activate(self)
+        include Configure
+        include Dependency
 
         configure :get_primary_key_columns
 

data/lib/view_data/pg/settings.rb

@@ -2,7 +2,7 @@ module ViewData
   module PG
     class Settings < MessageStore::Postgres::Settings
       def self.data_source
-        'settings/view_data_pg.json'
+        ENV['VIEW_DATA_SETTINGS_PATH'] || 'settings/view_data_pg.json'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-view_data-pg
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.1.1.1
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-consumer-postgres
@@ -84,7 +84,7 @@ homepage: https://github.com/eventide-contrib/view-data-pg
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Create and populate PostgreSQL view databases from event streams
 test_files: []