sequel 5.108.0 → 5.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb20cf6a0935b45043b5dc3d5ba39256f5c9fe34a1894a32383211f4cbeced5
-  data.tar.gz: a5a0c9a83a2862f133516a91b76862e0f69e6b4ac95356a7358e0ae798ab6449
+  metadata.gz: d532e5b8b7464ce5420441aada5a737826aadf657b7ae2d74e00947fb9073b8c
+  data.tar.gz: 8768f69d56e2683b1a3613fb087372fb419fe5086f6e6c399278d648e106527b
 SHA512:
-  metadata.gz: bde58f0598455d105c3c4a2e3d30ebf86776c2acbef2ccfdf6ea0f3c36772396c42be9678f8e03bbfab41e06a593f2d3e6e651a8fbded9ffa3fb2f13c2f1f1eb
-  data.tar.gz: d92f6fa652e500b92106aaafb5646dab52c80647e0cf1d42164cdccdf16e8e56209b3205b8699e99704bfae480bdd4846769100e7e602c2ac72d4a9383765b60
+  metadata.gz: 9e1c3559c9fe77f574f54e6b0c67a1ab421d9cc2661aba5121693bc0a101e7d922474e443ae2c93ff55a7a4e7880c7a1eb9b6476a9b2b4b22fbb361d616996db
+  data.tar.gz: '07583c0e8b4375f7016a8806973ff555ec8dc2225f0306b8a73535e34c1a517a3d5071299613d80b328cd1835519a5df577b372495ef793c1e58aad271ae9661'

data/lib/sequel/adapters/amalgalite.rb

@@ -7,13 +7,39 @@ module Sequel
   module Amalgalite
     # Type conversion map class for Sequel's use of Amalgamite
     class SequelTypeMap < ::Amalgalite::TypeMaps::DefaultMap
-      methods_handling_sql_types.delete('string')
-      methods_handling_sql_types.merge!(
-        'datetime' => %w'datetime timestamp',
-        'time' => %w'time',
-        'float' => ['float', 'double', 'real', 'double precision'],
-        'decimal' => %w'numeric decimal money'
-      )
+      if respond_to?(:methods_handling_sql_types, true)
+        # Amalgalite < 2 support
+        methods_handling_sql_types.delete('string')
+        methods_handling_sql_types.merge!(
+          'datetime' => %w'datetime timestamp',
+          'time' => %w'time',
+          'float' => ['float', 'double', 'real', 'double precision'],
+          'decimal' => %w'numeric decimal money'
+
+        )
+
+        def result_value_method(type)
+          self.class.sql_to_method(type)
+        end
+      else
+        # Amalgalite 2 support
+        SQL_TO_METHOD = superclass::SQL_TO_METHOD.merge(
+          'datetime' => :datetime,
+          'timestamp' => :datetime,
+          'time' => :time,
+          'float' => :float,
+          'double' => :float,
+          'real' => :float,
+          'double precision' => :float,
+          'decimal' => :decimal,
+          'numeric' => :decimal,
+          'money' => :decimal
+        )
+
+        def result_value_method(type)
+          SQL_TO_METHOD[type]
+        end
+      end
 
       # Store the related database object, in order to be able to correctly
       # handle the database timezone.
@@ -48,7 +74,7 @@ module Sequel
         if value.is_a?(::Amalgalite::Blob)
           SQL::Blob.new(value.to_s)
         elsif value.is_a?(String) && declared_type
-          (meth = self.class.sql_to_method(declared_type.downcase)) ? public_send(meth, value) : value
+          (meth = result_value_method(declared_type.downcase)) ? public_send(meth, value) : value
         else
           super
         end

data/lib/sequel/adapters/jdbc/mssql.rb

@@ -12,11 +12,34 @@ module Sequel
         
         # Get the last inserted id using SCOPE_IDENTITY().
         def last_insert_id(conn, opts=OPTS)
-          statement(conn) do |stmt|
-            sql = opts[:prepared] ? 'SELECT @@IDENTITY' : 'SELECT SCOPE_IDENTITY()'
-            rs = log_connection_yield(sql, conn){stmt.executeQuery(sql)}
-            rs.next
-            rs.getLong(1)
+          if (stmt = opts[:stmt]) && opts[:prepared]
+            rs = stmt.getGeneratedKeys
+            begin
+              if rs.next
+                begin
+                  rs.getLong(1)
+                rescue
+                  rs.getObject(1) rescue nil
+                end
+              end
+            ensure
+              rs.close
+            end
+          else
+            statement(conn) do |stmt|
+              sql = 'SELECT SCOPE_IDENTITY()'
+              rs = log_connection_yield(sql, conn){stmt.executeQuery(sql)}
+              rs.next
+              rs.getLong(1)
+            end
+          end
+        end
+
+        def prepare_jdbc_statement(conn, sql, opts)
+          if opts[:type] == :insert
+            conn.prepareStatement(sql, JavaSQL::Statement::RETURN_GENERATED_KEYS)
+          else
+            super
           end
         end
         

data/lib/sequel/adapters/jdbc/postgresql.rb

@@ -75,7 +75,14 @@ module Sequel
         def copy_table(table, opts=OPTS)
           synchronize(opts[:server]) do |conn|
             copy_manager = Java::OrgPostgresqlCopy::CopyManager.new(conn)
-            copier = copy_manager.copy_out(copy_table_sql(table, opts))
+            sql = copy_table_sql(table, opts)
+
+            begin
+              copier = copy_manager.copy_out(sql)
+            rescue *DATABASE_ERROR_CLASSES => e
+              raise_error(e)
+            end
+              
             begin
               if defined?(yield)
                 while buf = copier.readFromCopy
@@ -147,7 +154,11 @@ module Sequel
         # a PGObject instance with unknown type and the bound argument string value,
         # and set that as the prepared statement argument.
         def set_ps_arg(cps, arg, i)
-          if v = bound_variable_arg(arg, nil)
+          unless v = bound_variable_arg(arg, nil)
+            v = arg.strftime("%F %T.%6N%z") if arg.is_a?(DateTime)
+          end
+
+          if v
             obj = Java::OrgPostgresqlUtil::PGobject.new
             obj.setType("unknown")
             obj.setValue(v)
@@ -202,7 +213,7 @@ module Sequel
         INTEGER_TYPE = Java::JavaSQL::Types::INTEGER
         STRING_TYPE = Java::JavaSQL::Types::VARCHAR
         ARRAY_TYPE = Java::JavaSQL::Types::ARRAY
-        PG_SPECIFIC_TYPES = [Java::JavaSQL::Types::ARRAY, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT, Java::JavaSQL::Types::TIME_WITH_TIMEZONE, Java::JavaSQL::Types::TIME].freeze
+        PG_SPECIFIC_TYPES = [Java::JavaSQL::Types::ARRAY, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT, Java::JavaSQL::Types::TIME_WITH_TIMEZONE, Java::JavaSQL::Types::TIME, Java::JavaSQL::Types::TIMESTAMP_WITH_TIMEZONE, Java::JavaSQL::Types::TIMESTAMP].freeze
 
         # Return PostgreSQL hstore types as ruby Hashes instead of
         # Java HashMaps.  Only used if the database does not have a

data/lib/sequel/adapters/jdbc.rb

@@ -24,7 +24,7 @@ module Sequel
     
     # Default database error classes
     DATABASE_ERROR_CLASSES = [NativeException]
-    if JRUBY_VERSION < '9.2'
+    if JRUBY_VERSION.to_r < Rational('9.2')
       # On JRuby <9.2, still include ::NativeException, as it is still needed in some cases
       DATABASE_ERROR_CLASSES << ::NativeException
     end
@@ -496,6 +496,7 @@ module Sequel
           rescue *DATABASE_ERROR_CLASSES => e
             raise_error(e)
           ensure
+            cps.clear_parameters
             cps.close unless name
           end
         end

data/lib/sequel/adapters/postgres.rb

@@ -371,7 +371,8 @@ module Sequel
         # 
         # The following options are respected:
         #
-        # :format :: The format to use.  text is the default, so this should be :csv or :binary.
+        # :format :: The format to use. The PostgreSQL default is text, possible options are :csv,
+        #            :json, or :binary.
         # :options :: An options SQL string to use, which should contain comma separated options.
         # :server :: The server on which to run the query.
         #
@@ -380,7 +381,9 @@ module Sequel
         # of the data.
         def copy_table(table, opts=OPTS)
           synchronize(opts[:server]) do |conn|
-            conn.execute(copy_table_sql(table, opts))
+            sql = copy_table_sql(table, opts)
+            check_database_errors{conn.execute(sql)}
+
             begin
               if defined?(yield)
                 while buf = conn.get_copy_data

data/lib/sequel/adapters/shared/db2.rb

@@ -190,6 +190,9 @@ module Sequel
       # creating the table, since it is not possible to do it in one step.
       def create_table_as(name, sql, options)
         super
+        if options[:temp]
+          name = Sequel.qualify(:session, name)
+        end
         from(name).insert(sql.is_a?(Dataset) ? sql : dataset.with_sql(sql))
       end
 

data/lib/sequel/adapters/shared/mssql.rb

@@ -400,6 +400,9 @@ module Sequel
       # Error if a string is given.
       def create_table_as(name, ds, options)
         raise(Error, "must provide dataset instance as value of create_table :as option on MSSQL") unless ds.is_a?(Sequel::Dataset)
+        if options[:temp]
+          name = create_table_temp_table_name_sql(name, options)
+        end
         run(ds.into(name).sql.freeze)
       end
     
@@ -679,7 +682,10 @@ module Sequel
    
       # MSSQL uses the CONTAINS keyword for full text search
       def full_text_search(cols, terms, opts = OPTS)
-        terms = "\"#{Sequel.array_or_set_join(terms, '" OR "')}\"" if terms.is_a?(Array) || terms.is_a?(Set)
+        case terms
+        when Array, Set
+          terms = Sequel.array_or_set_join(terms.map{|term| "\"#{term.to_s.gsub('"', '""')}\""}, " OR ")
+        end
         where(Sequel.lit("CONTAINS (?, ?)", cols, terms))
       end