occams-record 1.12.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e051033114483887f29a642acfd83c92907d10f15ebac551cbbb61bcc73bf3
-  data.tar.gz: b14f0462cdf4b04c3264f40e9bad8ec11042f23abad2fa0933b16ea02ff03d44
+  metadata.gz: f8c516a796e28c82bb9143b832a04731756fcff86c45c0aea39c8cd44360130c
+  data.tar.gz: 84949e1481e0ba095fb07f6fb5025e41f173754b2bc8f8043f7b87a96227349f
 SHA512:
-  metadata.gz: 2ccd9b91278ba7e95ba178ae786e17721d058c5f433b1594982fcd8e9e3c75c304d3bbe6a28f80ca543c71e53a0c053503f200a82083f2fe7d20e4072c99b86b
-  data.tar.gz: 575e5804b5d6a14f8f02c3afa1309310111a93bf77788d10b5e67d24bc67a88b072e9a2f9c25b31715a96bb47098066b47bbb5d9fceaf4c4da7cf0b0d4d2fc76
+  metadata.gz: 19e8dc49487a7268eb00607ce7a2a05937ace0102080fe2321e8dddd20760900e841d36f37f5fb5a9cd45d413a81b8bcc47ff3438de8480e13070c502e908953
+  data.tar.gz: 6111775732bdf38efed21fdb8ecfccd254f1f80d775a543698cef217a564b31a2aa39ae1b56944df03fc02c2762e0f05965d20251a81c0b9320c2b58db37a210

data/README.md

@@ -361,8 +361,8 @@ It's possible to run tests without Docker Compose, but you'll be limited by the
 
 ```bash
 bundle install
-bundle exec appraisal ar-7.0 bundle install
-bundle exec appraisal ar-7.0 rake test
+bundle exec appraisal ar-8.0 bundle install
+bundle exec appraisal ar-8.0 rake test
 ```
 
 # License

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/measureable.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 module OccamsRecord
   Measurements = Struct.new(:total_time, :queries)
   Measurement = Struct.new(:table_name, :sql, :time)

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/type_caster.rb

@@ -3,7 +3,7 @@ module OccamsRecord
     # @private
     CASTER =
       case ActiveRecord::VERSION::MAJOR
-      when 6, 7 then :deserialize
+      when 6, 7, 8 then :deserialize
       else raise "OccamsRecord::TypeCaster::CASTER does yet support this version of ActiveRecord"
       end
 

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # @private
-  VERSION = "1.12.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.12.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
 description: A faster, lower-memory, fuller-featured querying API for ActiveRecord
   that returns results as unadorned, read-only objects.
 email: jordan.hollinger@gmail.com
@@ -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:
   - - ">="