sequel 4.46.0 → 4.49.0

data/lib/sequel/extensions/pg_hstore.rb

@@ -49,18 +49,18 @@
 #
 # * \[\]
 # * \[\]=
-# * assoc (ruby 1.9 only)
+# * assoc
 # * delete
 # * fetch
 # * has_key?
 # * has_value?
 # * include?
-# * key (ruby 1.9 only)
+# * key
 # * key?
 # * member?
 # * merge
 # * merge!
-# * rassoc (ruby 1.9 only)
+# * rassoc
 # * replace
 # * store
 # * update
@@ -70,10 +70,7 @@
 #
 #   DB[:table].insert(:column=>Sequel.hstore('foo'=>'bar'))
 #
-# If you would like to use hstore columns in your model objects, you
-# probably want to modify the schema parsing/typecasting so that it
-# recognizes and correctly handles the hstore columns, which you can
-# do by:
+# To use this extension, first load it into your Sequel::Database instance:
 #
 #   DB.extension :pg_hstore
 #
@@ -95,12 +92,19 @@ module Sequel
       # Parser for PostgreSQL hstore output format.
       class Parser < StringScanner
         QUOTE_RE = /"/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :QUOTE_RE)
         KV_SEP_RE = /"\s*=>\s*/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :KV_SEP_RE)
         NULL_RE = /NULL/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :NULL_RE)
         SEP_RE = /,\s*/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :SEP_RE)
         QUOTED_RE = /(\\"|[^"])*/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :QUOTED_RE)
         REPLACE_RE = /\\(.)/.freeze
+        Sequel::Deprecation.deprecate_constant(self, :REPLACE_RE)
         REPLACE_WITH = '\1'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :REPLACE_WITH)
 
         # Parse the output format that PostgreSQL uses for hstore
         # columns.  Note that this does not attempt to parse all
@@ -114,17 +118,17 @@ module Sequel
           return @result if @result
           hash = {}
           while !eos?
-            skip(QUOTE_RE)
+            skip(/"/)
             k = parse_quoted
-            skip(KV_SEP_RE)
-            if skip(QUOTE_RE)
+            skip(/"\s*=>\s*/)
+            if skip(/"/)
               v = parse_quoted
-              skip(QUOTE_RE)
+              skip(/"/)
             else
-              scan(NULL_RE)
+              scan(/NULL/)
               v = nil
             end
-            skip(SEP_RE)
+            skip(/,\s*/)
             hash[k] = v
           end
           @result = hash
@@ -134,7 +138,7 @@ module Sequel
 
         # Parse and unescape a quoted key/value.
         def parse_quoted
-          scan(QUOTED_RE).gsub(REPLACE_RE, REPLACE_WITH)
+          scan(/(\\"|[^"])*/).gsub(/\\(.)/, '\1')
         end
       end
 
@@ -158,6 +162,13 @@ module Sequel
           end
         end
 
+        # SEQUEL5: Remove
+        def reset_conversion_procs
+          procs = super
+          add_named_conversion_proc(:hstore, &HStore.method(:parse))
+          procs 
+        end
+
         private
 
         # Recognize the hstore database type.
@@ -188,12 +199,19 @@ module Sequel
       DEFAULT_PROC = lambda{|h, k| h[k.to_s] unless k.is_a?(String)}
 
       QUOTE = '"'.freeze
+      Sequel::Deprecation.deprecate_constant(self, :QUOTE)
       COMMA = ",".freeze
+      Sequel::Deprecation.deprecate_constant(self, :COMMA)
       KV_SEP = "=>".freeze
+      Sequel::Deprecation.deprecate_constant(self, :KV_SEP)
       NULL = "NULL".freeze
+      Sequel::Deprecation.deprecate_constant(self, :NULL)
       ESCAPE_RE = /("|\\)/.freeze
+      Sequel::Deprecation.deprecate_constant(self, :ESCAPE_RE)
       ESCAPE_REPLACE = '\\\\\1'.freeze
+      Sequel::Deprecation.deprecate_constant(self, :ESCAPE_REPLACE)
       HSTORE_CAST = '::hstore'.freeze
+      Sequel::Deprecation.deprecate_constant(self, :HSTORE_CAST)
 
       if RUBY_VERSION >= '1.9'
         # Undef 1.9 marshal_{dump,load} methods in the delegate class,
@@ -258,7 +276,7 @@ module Sequel
       # Append a literalize version of the hstore to the sql.
       def sql_literal_append(ds, sql)
         ds.literal_append(sql, unquoted_literal)
-        sql << HSTORE_CAST
+        sql << '::hstore'
       end
 
       # Return a string containing the unquoted, unstring-escaped
@@ -267,10 +285,10 @@ module Sequel
       def unquoted_literal
         str = String.new
         comma = false
-        commas = COMMA
-        quote = QUOTE
-        kv_sep = KV_SEP
-        null = NULL
+        commas = ","
+        quote = '"'
+        kv_sep = "=>"
+        null = "NULL"
         each do |k, v|
           str << commas if comma
           str << quote << escape_value(k) << quote
@@ -303,7 +321,7 @@ module Sequel
       # Escape key/value strings when literalizing to
       # correctly handle backslash and quote characters.
       def escape_value(k)
-        k.to_s.gsub(ESCAPE_RE, ESCAPE_REPLACE)
+        k.to_s.gsub(/("|\\)/, '\\\\\1')
       end
     end
   end

data/lib/sequel/extensions/pg_inet.rb

@@ -29,7 +29,7 @@
 # Related module: Sequel::Postgres::InetDatabaseMethods
 
 require 'ipaddr'
-Sequel.require 'adapters/utils/pg_types'
+Sequel.require 'adapters/shared/postgres'
 
 module Sequel
   module Postgres
@@ -41,7 +41,14 @@ module Sequel
       def self.extended(db)
         db.instance_eval do
           extend_datasets(InetDatasetMethods)
-          copy_conversion_procs([869, 650, 1041, 651, 1040])
+          meth = IPAddr.method(:new)
+          add_conversion_proc(869, meth)
+          add_conversion_proc(650, meth)
+          if respond_to?(:register_array_type)
+            register_array_type('inet', :oid=>1041, :scalar_oid=>869)
+            register_array_type('cidr', :oid=>651, :scalar_oid=>650)
+            register_array_type('macaddr', :oid=>1040)
+          end
           @schema_type_classes[:ipaddr] = IPAddr
         end
       end
@@ -106,11 +113,16 @@ module Sequel
       end
     end
 
-    PG_TYPES[869] = PG_TYPES[650] = IPAddr.method(:new)
+    # SEQUEL5: Remove
+    meth = IPAddr.method(:new)
+    PG__TYPES[869] = PG__TYPES[650] = lambda do |s|
+      Sequel::Deprecation.deprecate("Conversion proc for inet/cidr added globally by pg_inet extension", "Load the pg_inet extension into the Database instance")
+      IPAddr.new(s)
+    end
     if defined?(PGArray) && PGArray.respond_to?(:register)
-      PGArray.register('inet', :oid=>1041, :scalar_oid=>869)
-      PGArray.register('cidr', :oid=>651, :scalar_oid=>650)
-      PGArray.register('macaddr', :oid=>1040)
+      PGArray.register('inet', :oid=>1041, :scalar_oid=>869, :skip_deprecation_warning=>true)
+      PGArray.register('cidr', :oid=>651, :scalar_oid=>650, :skip_deprecation_warning=>true)
+      PGArray.register('macaddr', :oid=>1040, :skip_deprecation_warning=>true)
     end
   end
 

data/lib/sequel/extensions/pg_interval.rb

@@ -10,10 +10,7 @@
 # ActiveSupport::Duration that use the standard Sequel literalization
 # callbacks, so they work on all adapters.
 #
-# If you would like to use interval columns in your model objects, you
-# probably want to modify the typecasting so that it
-# recognizes and correctly handles the interval columns, which you can
-# do by:
+# To use this extension, load it into the Database instance:
 #
 #   DB.extension :pg_interval
 #
@@ -36,12 +33,13 @@
 # Related module: Sequel::Postgres::IntervalDatabaseMethods
 
 require 'active_support/duration'
-Sequel.require 'adapters/utils/pg_types'
+Sequel.require 'adapters/shared/postgres'
 
 module Sequel
   module Postgres
     module IntervalDatabaseMethods
       EMPTY_INTERVAL = '0'.freeze
+      Sequel::Deprecation.deprecate_constant(self, :EMPTY_INTERVAL)
       DURATION_UNITS = [:years, :months, :weeks, :days, :hours, :minutes, :seconds].freeze
 
       # Return an unquoted string version of the duration object suitable for
@@ -58,7 +56,7 @@ module Sequel
         end
 
         if s.empty?
-          EMPTY_INTERVAL
+          '0'
         else
           s
         end
@@ -67,11 +65,12 @@ module Sequel
       # Creates callable objects that convert strings into ActiveSupport::Duration instances.
       class Parser
         # Regexp that parses the full range of PostgreSQL interval type output.
-        PARSER = /\A([+-]?\d+ years?\s?)?([+-]?\d+ mons?\s?)?([+-]?\d+ days?\s?)?(?:(?:([+-])?(\d{2,10}):(\d\d):(\d\d(\.\d+)?))|([+-]?\d+ hours?\s?)?([+-]?\d+ mins?\s?)?([+-]?\d+(\.\d+)? secs?\s?)?)?\z/o
+        PARSER = /\A([+-]?\d+ years?\s?)?([+-]?\d+ mons?\s?)?([+-]?\d+ days?\s?)?(?:(?:([+-])?(\d{2,10}):(\d\d):(\d\d(\.\d+)?))|([+-]?\d+ hours?\s?)?([+-]?\d+ mins?\s?)?([+-]?\d+(\.\d+)? secs?\s?)?)?\z/
+        Sequel::Deprecation.deprecate_constant(self, :PARSER)
 
         # Parse the interval input string into an ActiveSupport::Duration instance.
         def call(string)
-          raise(InvalidValue, "invalid or unhandled interval format: #{string.inspect}") unless matches = PARSER.match(string)
+          raise(InvalidValue, "invalid or unhandled interval format: #{string.inspect}") unless matches = /\A([+-]?\d+ years?\s?)?([+-]?\d+ mons?\s?)?([+-]?\d+ days?\s?)?(?:(?:([+-])?(\d{2,10}):(\d\d):(\d\d(\.\d+)?))|([+-]?\d+ hours?\s?)?([+-]?\d+ mins?\s?)?([+-]?\d+(\.\d+)? secs?\s?)?)?\z/.match(string)
 
           value = 0
           parts = []
@@ -124,7 +123,10 @@ module Sequel
       def self.extended(db)
         db.instance_eval do
           extend_datasets(IntervalDatasetMethods)
-          copy_conversion_procs([1186, 1187])
+          add_conversion_proc(1186, Postgres::IntervalDatabaseMethods::PARSER)
+          if respond_to?(:register_array_type)
+            register_array_type('interval', :oid=>1187, :scalar_oid=>1186)
+          end
           @schema_type_classes[:interval] = ActiveSupport::Duration
         end
       end
@@ -174,6 +176,7 @@ module Sequel
 
     module IntervalDatasetMethods
       CAST_INTERVAL = '::interval'.freeze
+      Sequel::Deprecation.deprecate_constant(self, :CAST_INTERVAL)
 
       # Handle literalization of ActiveSupport::Duration objects, treating them as
       # PostgreSQL intervals.
@@ -181,16 +184,20 @@ module Sequel
         case v
         when ActiveSupport::Duration
           literal_append(sql, IntervalDatabaseMethods.literal_duration(v))
-          sql << CAST_INTERVAL
+          sql << '::interval'
         else
           super
         end
       end
     end
 
-    PG_TYPES[1186] = Postgres::IntervalDatabaseMethods::PARSER
+    # SEQUEL5: Remove
+    PG__TYPES[1186] = lambda do |s|
+      Sequel::Deprecation.deprecate("Conversion proc for interval added globally by pg_interval extension", "Load the pg_interval extension into the Database instance")
+      Postgres::IntervalDatabaseMethods::PARSER.call(s)
+    end
     if defined?(PGArray) && PGArray.respond_to?(:register)
-      PGArray.register('interval', :oid=>1187, :scalar_oid=>1186)
+      PGArray.register('interval', :oid=>1187, :scalar_oid=>1186, :skip_deprecation_warning=>true)
     end
   end
 

data/lib/sequel/extensions/pg_json.rb

@@ -38,10 +38,7 @@
 #   DB[:table].insert(:column=>Sequel.pg_json([1, 2, 3]))
 #   DB[:table].insert(:column=>Sequel.pg_json({'a'=>1, 'b'=>2}))
 #
-# If you would like to use PostgreSQL json columns in your model
-# objects, you probably want to modify the schema parsing/typecasting
-# so that it recognizes and correctly handles the json type, which
-# you can do by:
+# To use this extension, please load it into the Database instance:
 #
 #   DB.extension :pg_json
 #
@@ -65,12 +62,14 @@
 
 require 'delegate'
 require 'json'
-Sequel.require 'adapters/utils/pg_types'
+Sequel.require 'adapters/shared/postgres'
 
 module Sequel
   module Postgres
     CAST_JSON = '::json'.freeze
+    Sequel::Deprecation.deprecate_constant(self, :CAST_JSON)
     CAST_JSONB = '::jsonb'.freeze
+    Sequel::Deprecation.deprecate_constant(self, :CAST_JSONB)
 
     # Class representing PostgreSQL JSON/JSONB column array values.
     class JSONArrayBase < DelegateClass(Array)
@@ -88,7 +87,7 @@ module Sequel
       # Cast as json
       def sql_literal_append(ds, sql)
         super
-        sql << CAST_JSON
+        sql << '::json'
       end
     end
 
@@ -96,7 +95,7 @@ module Sequel
       # Cast as jsonb
       def sql_literal_append(ds, sql)
         super
-        sql << CAST_JSONB
+        sql << '::jsonb'
       end
     end
 
@@ -119,7 +118,7 @@ module Sequel
       # Cast as json
       def sql_literal_append(ds, sql)
         super
-        sql << CAST_JSON
+        sql << '::json'
       end
     end
 
@@ -127,7 +126,7 @@ module Sequel
       # Cast as jsonb
       def sql_literal_append(ds, sql)
         super
-        sql << CAST_JSONB
+        sql << '::jsonb'
       end
     end
 
@@ -135,7 +134,12 @@ module Sequel
     module JSONDatabaseMethods
       def self.extended(db)
         db.instance_eval do
-          copy_conversion_procs([114, 199, 3802, 3807])
+          add_conversion_proc(114, JSONDatabaseMethods.method(:db_parse_json))
+          add_conversion_proc(3802, JSONDatabaseMethods.method(:db_parse_jsonb))
+          if respond_to?(:register_array_type)
+            register_array_type('json', :oid=>199, :scalar_oid=>114)
+            register_array_type('jsonb', :oid=>3807, :scalar_oid=>3802)
+          end
           @schema_type_classes[:json] = [JSONHash, JSONArray]
           @schema_type_classes[:jsonb] = [JSONBHash, JSONBArray]
         end
@@ -257,11 +261,18 @@ module Sequel
       end
     end
 
-    PG_TYPES[114] = JSONDatabaseMethods.method(:db_parse_json)
-    PG_TYPES[3802] = JSONDatabaseMethods.method(:db_parse_jsonb)
+    # SEQUEL5: Remove
+    PG__TYPES[114] = lambda do |s|
+      Sequel::Deprecation.deprecate("Conversion proc for json added globally by pg_json extension", "Load the pg_json extension into the Database instance")
+      JSONDatabaseMethods.db_parse_json(s)
+    end
+    PG__TYPES[3802] = lambda do |s|
+      Sequel::Deprecation.deprecate("Conversion proc for jsonb added globally by pg_json extension", "Load the pg_json extension into the Database instance")
+      JSONDatabaseMethods.db_parse_jsonb(s)
+    end
     if defined?(PGArray) && PGArray.respond_to?(:register)
-      PGArray.register('json', :oid=>199, :scalar_oid=>114)
-      PGArray.register('jsonb', :oid=>3807, :scalar_oid=>3802)
+      PGArray.register('json', :oid=>199, :scalar_oid=>114, :skip_deprecation_warning=>true)
+      PGArray.register('jsonb', :oid=>3807, :scalar_oid=>3802, :skip_deprecation_warning=>true)
     end
   end
 

data/lib/sequel/extensions/pg_json_ops.rb

@@ -3,7 +3,7 @@
 # The pg_json_ops extension adds support to Sequel's DSL to make
 # it easier to call PostgreSQL JSON functions and operators (added
 # first in PostgreSQL 9.3).  It also supports the JSONB functions
-# and operators added in PostgreSQL 9.4).
+# and operators added in PostgreSQL 9.4.
 #
 # To load the extension:
 #
@@ -22,7 +22,7 @@
 #  jb = Sequel.pg_jsonb(:jsonb_column)
 #
 # Also, on most Sequel expression objects, you can call the pg_json
-# or pg_jsonb # method:
+# or pg_jsonb method:
 #
 #   j = Sequel[:json_column].pg_json
 #   jb = Sequel[:jsonb_column].pg_jsonb