occams-record 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29615d5553b1bda52eebe8bb2c5883eb4cd7a24434dac8298b006c925d415bed
-  data.tar.gz: 0a7dea0524dbb874341b05cb3c44563a2ff6ccaf6138f20bcef13fead9af4088
+  metadata.gz: f8c516a796e28c82bb9143b832a04731756fcff86c45c0aea39c8cd44360130c
+  data.tar.gz: 84949e1481e0ba095fb07f6fb5025e41f173754b2bc8f8043f7b87a96227349f
 SHA512:
-  metadata.gz: d0f3f9d0c5c7a85ea41c88ed3e4bc4e61593a9a1f329d59baf7aa02065ebc3455ae9028cc6bdfd14d0ea50e904f510725ac54b73946f16ef56101d7ea869f2ad
-  data.tar.gz: fce1957894506de0ce88481ffaabb6b7ec87406cb048a9e196e0291b344a86ddc8a6750d1a2989b0cd20c1bf44ff352d38f8119ac908582535cb07d56fd67eb2
+  metadata.gz: 19e8dc49487a7268eb00607ce7a2a05937ace0102080fe2321e8dddd20760900e841d36f37f5fb5a9cd45d413a81b8bcc47ff3438de8480e13070c502e908953
+  data.tar.gz: 6111775732bdf38efed21fdb8ecfccd254f1f80d775a543698cef217a564b31a2aa39ae1b56944df03fc02c2762e0f05965d20251a81c0b9320c2b58db37a210

data/lib/occams-record/binds_converter/abstract.rb

@@ -10,21 +10,24 @@ module OccamsRecord
       # @private
       ESCAPE = "\\".freeze
 
-      def initialize(sql, bind_sigil)
+      def initialize(sql, binds, bind_sigil)
         @sql = sql
+        @binds = binds
         @end = sql.size - 1
         @start_i, @i = 0, 0
         @bind_sigil = bind_sigil
+        @found = []
       end
 
       # @return [String] The converted SQL string
       def to_s
         sql = ""
         each { |frag| sql << frag }
+        raise MissingBindValuesError.new(sql, missing_bind_values_msg) if @binds.size < @found.uniq.size
         sql
       end
 
-      protected
+      private
 
       # Yields each SQL fragment and converted bind to the given block
       def each

data/lib/occams-record/binds_converter/named.rb

@@ -4,20 +4,31 @@ module OccamsRecord
     # Converts Rails-style named binds (:foo) into native Ruby format (%{foo}).
     #
     class Named
-      def initialize(sql)
+      def initialize(sql, binds)
         @sql = sql
+        @binds = binds
+        @found = []
       end
 
       def to_s
-        @sql.gsub(/([:\\]?):([a-zA-Z]\w*)/) do |match|
+        sql = @sql.gsub(/([:\\]?):([a-zA-Z]\w*)/) do |match|
           if $1 == ":".freeze # skip PostgreSQL casts
             match # return the whole match
           elsif $1 == "\\".freeze # escaped literal colon
             match[1..-1] # return match with escaping backslash char removed
           else
+            @found << $2
             "%{#{$2}}"
           end
         end
+        raise MissingBindValuesError.new(sql, missing_bind_values_msg) if @binds.size < @found.uniq.size
+        sql
+      end
+
+      private
+
+      def missing_bind_values_msg
+        (@found - @binds.keys.map(&:to_s)).join(", ")
       end
     end
   end

data/lib/occams-record/binds_converter/positional.rb

@@ -4,17 +4,22 @@ module OccamsRecord
     # Converts Rails-style positional binds (?) into native Ruby format (%s).
     #
     class Positional < Abstract
-      def initialize(sql)
-        super(sql, "?".freeze)
+      def initialize(sql, binds)
+        super(sql, binds, "?".freeze)
       end
 
-      protected
+      private
 
       def get_bind
         @i += 1
         @start_i = @i
+        @found << @found.size
         "%s".freeze
       end
+
+      def missing_bind_values_msg
+        (@found.size - @binds.size).to_s
+      end
     end
   end
 end

data/lib/occams-record/binds_converter.rb

@@ -13,8 +13,8 @@ module OccamsRecord
     def self.convert(sql, binds)
       converter =
         case binds
-        when Hash then Named.new(sql)
-        when Array then Positional.new(sql)
+        when Hash then Named.new(sql, binds)
+        when Array then Positional.new(sql, binds)
         else raise ArgumentError, "OccamsRecord: Unsupported SQL bind params '#{binds.inspect}'. Only Hash and Array are supported"
         end
       converter.to_s

data/lib/occams-record/errors.rb

@@ -1,4 +1,16 @@
 module OccamsRecord
+  # Exception raised when not enough bind values were given
+  class MissingBindValuesError < StandardError
+    def initialize(sql, message)
+      @sql = sql
+      @message = message
+    end
+
+    def to_s = message
+
+    def message = "Missing binds (#{@message}) in #{@sql}"
+  end
+
   # Exception raised when a record wasn't loaded with all requested data
   class MissingDataError < StandardError
     # @return [String]

data/lib/occams-record/raw_query.rb

@@ -194,7 +194,7 @@ module OccamsRecord
     end
 
     #
-    # Returns a cursor you can open and perform operations on. A lower-level alternative to 
+    # Returns a cursor you can open and perform operations on. A lower-level alternative to
     # find_each_with_cursor and find_in_batches_with_cursor.
     #
     # NOTE Postgres only. See the docs for OccamsRecord::Cursor for more details.

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # @private
-  VERSION = "1.13.0".freeze
+  VERSION = "1.14.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-14 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="