better_batch 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b208e3117c167c67e291224859745f7fa44d7f777b81b07e4f0f4e4537295b57
-  data.tar.gz: e8e6690424e9e9d9db8d613a201bd1551938e5f7502fb304c7dcfbe3ea2de482
+  metadata.gz: e8920be816452f9abe8b7e6232f28a98125d1822af759e9a44306a6a09f88a36
+  data.tar.gz: 29764cca73ca165266b481c80540aa6f3f642d00ff1a5f3a460b2ff31fcf64e9
 SHA512:
-  metadata.gz: 7787219a815f6e26796f0563b1a36b7877e08f866d72f423823bbf0f08a96ebb6d32c071547dccc4523988473f46661019d7c9171e475f5e37e19089396a4eb2
-  data.tar.gz: 1ae506ba8b32252090a802af2fd6e463e0753f3f8e5c34f0a8f77cd7d3744e0a0cf4f68785c9f92408c9ba109d8a8f9b2882ba55be25cfa60a21dd62c3285d9a
+  metadata.gz: 3b15e7ed5955cd8417bdec58eeedcd82dd99cd69305b5e83057da0a9117199a29467af9e3e64bdb8887b7cc7fec5fd68e5ccae6d069876fc926f2f40e0814351
+  data.tar.gz: e8dc815ba9b79c856f5908528ce08da075a6290c415b01f2fe713055434c84715792197426667e274eabe28ad686e7673ec229093cc55b1470d7aaa292857457

data/lib/better_batch/inputs.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'better_batch/word'
+
 module BetterBatch
-  Inputs = Struct.new(
+  InputsStruct = Struct.new(
     :table_name,
     :primary_key,
     :input_columns,
@@ -16,11 +18,11 @@ module BetterBatch
   # this strange (to me) setup avoids method redefinition warnings
   module InstanceOverrides
     def preprocess!
-      self[:column_types].transform_keys!(&:to_sym)
+      self[:column_types] = self[:column_types].transform_keys(&BetterBatch::Word.method(:new))
       preprocess_returning
       ensure_lists!
-      symbolize_lists!
-      symbolize!
+      to_word_lists!
+      to_word!
     end
 
     private
@@ -38,20 +40,26 @@ module BetterBatch
       end
     end
 
-    def symbolize_lists!
+    def to_word_lists!
       %i[input_columns unique_columns now_on_insert now_on_update returning].each do |field|
-        self[field].map!(&:to_sym)
+        self[field] = self[field].map do |it|
+          if it.is_a?(BetterBatch::Word)
+            it
+          else
+            BetterBatch::Word.new(it)
+          end
+        end
       end
     end
 
-    def symbolize!
+    def to_word!
       %i[table_name primary_key].each do |field|
-        self[field] = self[field].to_sym
+        self[field] = BetterBatch::Word.new(self[field])
       end
     end
   end
 
-  class Inputs
+  class Inputs < InputsStruct
     prepend InstanceOverrides
   end
 end

data/lib/better_batch/postgresql_reserved.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module BetterBatch # rubocop:disable Metrics/ModuleLength
+  POSTGRESQL_RESERVED = Set.new(
+    %w[
+      all
+      analyse
+      analyze
+      and
+      any
+      array
+      as
+      asc
+      asymmetric
+      authorization
+      binary
+      both
+      case
+      cast
+      check
+      collate
+      collation
+      column
+      concurrently
+      constraint
+      create
+      cross
+      current_catalog
+      current_date
+      current_role
+      current_schema
+      current_time
+      current_timestamp
+      current_user
+      default
+      deferrable
+      desc
+      distinct
+      do
+      else
+      end
+      except
+      false
+      fetch
+      for
+      foreign
+      freeze
+      from
+      full
+      grant
+      group
+      having
+      ilike
+      in
+      initially
+      inner
+      intersect
+      into
+      is
+      isnull
+      join
+      lateral
+      leading
+      left
+      like
+      limit
+      localtime
+      localtimestamp
+      natural
+      not
+      notnull
+      null
+      offset
+      on
+      only
+      or
+      order
+      outer
+      overlaps
+      placing
+      primary
+      references
+      returning
+      right
+      select
+      session_user
+      similar
+      some
+      symmetric
+      system_user
+      table
+      tablesample
+      then
+      to
+      trailing
+      true
+      union
+      unique
+      user
+      using
+      variadic
+      verbose
+      when
+      where
+      window
+      with
+    ]
+  )
+end

data/lib/better_batch/selected.rb

@@ -40,7 +40,7 @@ module BetterBatch
     end
 
     def typed_columns_sql
-      @typed_columns_sql ||= input_columns.map { |c| "#{c} #{column_types[c]}" }.join(', ')
+      @typed_columns_sql ||= input_columns.map { |c| "#{c} #{column_types.fetch(c)}" }.join(', ')
     end
 
     def input_columns_sql

data/lib/better_batch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterBatch
-  VERSION = '1.0.3'
+  VERSION = '1.0.5'
 end

data/lib/better_batch/word.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'better_batch/postgresql_reserved'
+
+module BetterBatch
+  class Word
+    attr_reader :input, :hash
+
+    def initialize(input)
+      @input = input.to_sym
+      @input_str = input.to_s.freeze
+      downcased = @input_str.downcase
+      @output = if POSTGRESQL_RESERVED.include?(downcased) || @input_str != downcased
+                  "\"#{@input_str}\"".freeze
+                else
+                  @input_str
+                end
+      @hash = @input.hash
+    end
+
+    def to_s
+      @output
+    end
+
+    def ==(other)
+      case other
+      when self.class
+        input == other.input
+      else
+        raise "Did not know how to compare to #{other.inspect}."
+      end
+    end
+    # needed for list subtraction and hash keys
+    alias eql? ==
+
+    def inspect
+      "#<BetterBatch::Word @output=#{@output.inspect}>"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: better_batch
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Tyler Hartland
 bindir: exe
 cert_chain: []
-date: 2025-04-16 00:00:00.000000000 Z
+date: 2025-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anbt-sql-formatter
@@ -41,10 +41,12 @@ files:
 - lib/better_batch/.DS_Store
 - lib/better_batch/inputs.rb
 - lib/better_batch/inserted.rb
+- lib/better_batch/postgresql_reserved.rb
 - lib/better_batch/query.rb
 - lib/better_batch/selected.rb
 - lib/better_batch/updated.rb
 - lib/better_batch/version.rb
+- lib/better_batch/word.rb
 - sig/better_batch.rbs
 homepage: https://github.com/th7/better_batch
 licenses: