foobara-postgresql-crud-driver 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ce8966a4872d4a3e81a1bcfec564df6be8903cd20e7bf8b998b9fc6ba423b8
-  data.tar.gz: ead889be3b61d1293dd8c78ada43f3b2f3c68cbaa11af81ef6fbc3ce975fdc5f
+  metadata.gz: 2c70acc46afdd97ad49f99fab679f7e4ebc941b44d87602cf064d9b194ac3258
+  data.tar.gz: 802460242c1235c1f6633c6e59bce99a420ae0262bcf1caff537e772d4b9d66a
 SHA512:
-  metadata.gz: 3d7bdb1286bc1a27ad62217f278155225722e88cb01c8faa193c80a932f1b07d441ef78bc0dac56ade1ce7e29c51d85e63f28e4b77c7913184ccd695a077caca
-  data.tar.gz: a4509b915954600c4c7001e0e078856a8ef38063298877ff076cdfd94bf76c1b37b08a2488453e54084c7458189189a19881762406b4019a8d186e4de2f032b9
+  metadata.gz: 8581bb3c624df68dd3faa62bc761f668c8487015045053a2026b275aab255e0203c3eddb68df86fb62c03f863c3bb1e0f3114fa452019652b83da44d50952add
+  data.tar.gz: f2d6f26683f459db5680e2c0cda6d51bb22d5e9c0407a56ba15cdf4f91fb94060304266a0b6e6ef1c905c099e765b5b5a455c8e6c575cfdd4d36d8c8ccabb3b5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.0.6] - 2025-11-10
+
+- Include "_varchar" as a valid stringish pg type
+
+## [0.0.5] - 2025-11-10
+
+- Improve error messages for foobara type/pg column incompatibilities
+- Validate strings used as integers represent valid integers
+
 ## [0.0.4] - 2025-11-09
 
 - Support a few more column types

data/src/postgresql_crud_driver.rb

@@ -23,6 +23,23 @@ module Foobara
       end
     end
 
+    class ColumnTypeMismatchError < StandardError
+      attr_accessor :pg_type, :foobara_type, :entity_class, :attribute_name
+
+      def initialize(pg_type:, foobara_type:, entity_class:, attribute_name: nil)
+        # TODO: figure out a way to test this code path
+        # :nocov:
+        self.pg_type = pg_type
+        self.foobara_type = foobara_type
+        self.entity_class = entity_class
+        self.attribute_name = attribute_name
+
+        super("Column type mismatch between foobara #{foobara_type.type_symbol} " \
+              "and postgres #{pg_type} for #{entity_class.entity_name}.#{attribute_name}")
+        # :nocov:
+      end
+    end
+
     class << self
       def get_transaction_number
         @get_transaction_number ||= 0
@@ -237,6 +254,7 @@ module Foobara
         SQL
 
         raw_connection.exec(sql)
+
         find(record_id)
       end
 
@@ -323,6 +341,7 @@ module Foobara
         foobara_type = entity_class.model_type.element_types.element_types[attribute_name]
 
         value = begin
+          check_type_compatibility!(foobara_type, info, attribute_name:)
           pg_cast_value(value, foobara_type, info)
         rescue UnsupportedPgColumnTypeError => e
           # :nocov:
@@ -373,62 +392,86 @@ module Foobara
             # :nocov:
           end
         elsif foobara_type.extends?(:number)
-          case pg_type
-          when "integer", "bigint"
-            value.to_i
+          validate_intable!(value)
+          value.to_i
+        elsif foobara_type.extends?(:string) || foobara_type.extends?(:symbol)
+          "'#{PG::Connection.escape(value.to_s)}'"
+        elsif foobara_type.extends?(:datetime)
+          "'#{PG::Connection.escape(value.inspect)}'"
+        elsif foobara_type.extends?(:detached_entity)
+          pg_cast_value(value, foobara_type.target_class.primary_key_type, pg_info)
+        elsif foobara_type.extends?(:model) || foobara_type.extends?(:attributes) ||
+              foobara_type == BuiltinTypes[:duck]
+          "'#{PG::Connection.escape(JSON.fast_generate(value))}'"
+        elsif foobara_type.extends?(:array)
+          element_type = foobara_type.element_type
+
+          if element_type.extends?(:detached_entity)
+            if element_type.target_class.primary_key_type.extends?(:integer)
+              value.each { validate_intable!(it) }
+            end
+            elements_type = ARRAY_ELEMENT_ENCODERS[pg_info[:element_type]]
+            array_string = PG::TextEncoder::Array.new(elements_type:).encode(value)
+            escaped = PG::Connection.escape(array_string)
+
+            "'#{escaped}'"
           else
             # :nocov:
             raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
             # :nocov:
           end
+        else
+          # :nocov:
+          raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
+          # :nocov:
+        end
+      end
+
+      def validate_intable!(value)
+        if value.is_a?(::String) || value.is_a?(::Symbol)
+          unless value =~ /\A[+-]?\d+\z/
+            # :nocov:
+            raise "Expected something that could be cast to an integer but got #{value}"
+            # :nocov:
+          end
+        end
+      end
+
+      def check_type_compatibility!(foobara_type, pg_info, pg_type: pg_info[:type], attribute_name: nil)
+        if foobara_type.extends?(:integer)
+          unless pg_type == "integer" || pg_type == "bigint" || pg_type == "_int4"
+            # :nocov:
+            raise ColumnTypeMismatchError.new(pg_type:, foobara_type:, attribute_name:, entity_class:)
+            # :nocov:
+          end
         elsif foobara_type.extends?(:string) || foobara_type.extends?(:symbol)
-          case pg_type
-          when "text", "character varying"
-            "'#{PG::Connection.escape(value.to_s)}'"
-          else
+          unless pg_type == "text" || pg_type == "character varying" || pg_type == "_varchar"
             # :nocov:
-            raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
+            raise ColumnTypeMismatchError.new(pg_type:, foobara_type:, attribute_name:, entity_class:)
             # :nocov:
           end
         elsif foobara_type.extends?(:datetime)
-          case pg_type
-          when "timestamp without time zone"
-            "'#{PG::Connection.escape(value.inspect)}'"
-          else
+          unless pg_type == "timestamp without time zone"
             # :nocov:
-            raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
+            raise ColumnTypeMismatchError.new(pg_type:, foobara_type:, attribute_name:, entity_class:)
             # :nocov:
           end
         elsif foobara_type.extends?(:detached_entity)
-          pg_cast_value(value, foobara_type.target_class.primary_key_type, pg_info)
-        elsif foobara_type.extends?(:model) || foobara_type.extends?(:attributes)
-          case pg_type
-          when "jsonb", "json"
-            "'#{PG::Connection.escape(JSON.fast_generate(value))}'"
-          else
+          check_type_compatibility!(foobara_type.target_class.primary_key_type, pg_info, pg_type:, attribute_name:)
+        elsif foobara_type.extends?(:model) || foobara_type.extends?(:attributes) ||
+              foobara_type == BuiltinTypes[:duck]
+          unless pg_type == "jsonb" || pg_type == "json"
             # :nocov:
-            raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
+            raise ColumnTypeMismatchError.new(pg_type:, foobara_type:, attribute_name:, entity_class:)
             # :nocov:
           end
         elsif foobara_type.extends?(:array)
-          element_type = foobara_type.element_type
-
-          if element_type.extends?(:detached_entity)
-            case pg_type
-            when "ARRAY"
-              elements_type = ARRAY_ELEMENT_ENCODERS[pg_info[:element_type]]
-              array_string = PG::TextEncoder::Array.new(elements_type:).encode(value)
-              escaped = PG::Connection.escape(array_string)
-
-              "'#{escaped}'"
-            else
-              # :nocov:
-              raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
-              # :nocov:
-            end
-          else
+          if pg_type == "ARRAY"
+            element_type = foobara_type.element_type
+            check_type_compatibility!(element_type, pg_info, pg_type: pg_info[:element_type], attribute_name:)
             # :nocov:
-            raise UnsupportedPgColumnTypeError.new(pg_type, entity_class)
+          elsif pg_type != json && pg_type != jsonb
+            raise ColumnTypeMismatchError.new(pg_type:, foobara_type:, attribute_name:, entity_class:)
             # :nocov:
           end
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-postgresql-crud-driver
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Miles Georgi