sequel-hexspace 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2949511f39f19c48b5120965d8b236fe93215c07ee9cf987d7b80f81d649b81
-  data.tar.gz: 68b65e86ccc1ad3cc1fef989eb1d79b7927f96c4f4b5a60abb9699c7b425f4a4
+  metadata.gz: b4421ed6430cdfa0ede39d8b4956c01de6e65317af4c9ab72238e06aa98d0e18
+  data.tar.gz: b01b91610baad3b154d7a44c193ad29e88fc940de34473158e60521af958161e
 SHA512:
-  metadata.gz: 021db16089f80aee9a8398b54747265e6eedb59713b7fac36316d4623a324ce96036e532df0ac75171ec47a04ade882ee168c5c773e5487a7591567bfaab707c
-  data.tar.gz: 2767b9661167bc70fb775513f4abcb0465a77cc19c16f9bdb94972acd30896a310c3daeb6d8a34cfdd089ccf6c8bd6558bc459a9ae2eb3415c7cfd35b5d7273a
+  metadata.gz: bfb4bbe3fddb1be528f0cdd382e78dfcf651edd36de086248742cc4d31d23dfa293b4619ba70acf6066681fe58cb6b0661373badd187c80fd8df54935513e3cd
+  data.tar.gz: 5a979505d337170a4d41bf96e135118284b34461a21611167856d0e95b79b63bf11eb71f4adae733c7ea579347d40091fba7ab038bc1efa5d10ccdf701801f5e

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+## 2.0.0 (unreleased)
+
+### Breaking
+
+- Declare `required_ruby_version >= 3.3`. Ruby 3.2 reached end of life in March
+  2026 and is no longer tested. Installing on an older Ruby now fails with a
+  clear message rather than breaking at runtime. This is the only breaking
+  change, and it is what makes this release a major one.
+
+### Note on the gap since 1.0.0
+
+1.0.0 (April 2024) is the only version ever published; 1.0.1 was tagged in the
+repository but never released. Everything below has therefore been unavailable
+to users until now, and this is the first release to carry any of it. The list is
+reconstructed from git history.
+
+### Added
+
+- Shared Hexspace mock adapter support, so dependent projects can test without a
+  live Spark server.
+- `EXTERNAL`, `LOCATION` and `LIKE` support in `CREATE TABLE`.
+- Always-on SimpleCov coverage and RuboCop enforcement in the development setup.
+
+### Fixed
+
+- Support thrift 0.24 by restoring `Thrift::Client#handle_exception` and
+  `#reply_seqid`, which 0.24.0 removed while hexspace's generated client still
+  calls them. Without this every Spark connection failed with a
+  `Sequel::DatabaseConnectionError`. thrift is constrained to `>= 0.18, < 0.25`.
+- Silence a frozen-string-literal warning from thrift 0.22.0 on Ruby 3.4+.
+- `Database#database_type` returns `:spark` rather than `:hexspace`.
+- Ignore `CASCADE` in `drop_table_sql`, which Spark SQL does not accept.
+- Route prepared `DELETE` statements through the emulated delete path.
+- Date and timestamp casting and literalisation, including Ruby 4.0
+  compatibility.

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2023 Jeremy Evans
+Copyright (c) 2026 Outcomes Insights, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/lib/sequel/adapters/hexspace.rb

@@ -1,10 +1,77 @@
+require_relative 'shared/hexspace'
 require 'hexspace'
-require_relative 'shared/spark'
+
+# Backport upstream fix (THRIFT-5909, PR #3270) for thrift 0.22.0 on Ruby 3.4+.
+# Thrift::Bytes.empty_byte_buffer calls force_encoding on string literals,
+# which triggers "literal string will be frozen in the future" warnings.
+# Remove this once thrift > 0.22.0 is released with the fix.
+if defined?(Thrift::Bytes) && (spec = Gem.loaded_specs['thrift']) && spec.version < Gem::Version.new('0.23')
+  module Thrift
+    module Bytes
+      def self.empty_byte_buffer(size=nil)
+        if size&.positive?
+          "\0".b * size
+        else
+          ''.b
+        end
+      end
+    end
+  end
+end
+
+# Restore Thrift::Client#handle_exception and #reply_seqid for thrift >= 0.24.
+#
+# hexspace's generated Thrift client (lib/hexspace/tcli_service.rb) calls both,
+# 21 times each. thrift 0.24.0 removed them, folding their work into the new
+# #validate_message_begin -- so on thrift 0.24 every Spark connection dies in
+# recv_OpenSession with NoMethodError, surfacing as
+# Sequel::DatabaseConnectionError.
+#
+# Upstream will not fix this for us: hexspace's generated client is untouched
+# since 2023-05-08, the latest release (0.3.0, Apr 2025) predates thrift 0.24,
+# and no issue or PR there mentions thrift. Regenerating that client against
+# 0.24 would drop support for thrift < 0.24, which is a maintainer's decision
+# rather than ours to force.
+#
+# Both methods are restored verbatim from thrift 0.23.0 and are implemented
+# purely in terms of primitives thrift 0.24 still provides and still uses in
+# validate_message_begin. The dequeue accounting is unchanged: exactly one
+# dequeue_pending_seqid per call on both the reply and the exception path.
+#
+# Note this keeps 0.23 semantics -- it does NOT add 0.24's stricter checks for
+# invalid message type and wrong method name. Remove once hexspace regenerates
+# its client against thrift >= 0.24.
+# rubocop:disable-next Style/GuardClause, Naming/PredicateMethod
+if defined?(Thrift::Client)
+  # Both methods below are copied verbatim from thrift 0.23.0 and deliberately
+  # not restyled: keeping them byte-comparable with upstream is what makes them
+  # auditable. reply_seqid also cannot be renamed to a predicate -- hexspace's
+  # generated client calls it by that exact name.
+  module Thrift
+    module Client
+      unless method_defined?(:handle_exception) || private_method_defined?(:handle_exception)
+        def handle_exception(mtype)
+          if mtype == MessageTypes::EXCEPTION
+            dequeue_pending_seqid
+            raise_application_exception
+          end
+        end
+      end
+
+      unless method_defined?(:reply_seqid) || private_method_defined?(:reply_seqid)
+        def reply_seqid(rseqid)
+          expected_seqid = dequeue_pending_seqid
+          !expected_seqid.nil? && rseqid == expected_seqid
+        end
+      end
+    end
+  end
+end
 
 module Sequel
   module Hexspace
     class Database < Sequel::Database
-      include Spark::DatabaseMethods
+      include DatabaseMethods
 
       set_adapter_scheme :hexspace
 
@@ -27,6 +94,17 @@ module Sequel
         conn.instance_variable_set(:@sequel_invalid, true)
       end
 
+      # Hexspace returns timestamp strings in UTC without an explicit offset.
+      # When no database timezone is configured, Sequel treats naive strings as
+      # local time, which shifts CURRENT_TIMESTAMP by the local UTC offset.
+      def to_application_timestamp(value)
+        if value.is_a?(String) && timezone.nil? && value !~ /(?:Z|[+-]\d{2}(?::?\d{2})?)\z/
+          Sequel.convert_timestamp(value, :utc)
+        else
+          super
+        end
+      end
+
       def execute(sql, opts=OPTS)
         synchronize(opts[:server]) do |conn|
           res = log_connection_yield(sql, conn){conn.execute(sql, result_object: true)}
@@ -51,7 +129,7 @@ module Sequel
     end
 
     class Dataset < Sequel::Dataset
-      include Spark::DatasetMethods
+      include DatasetMethods
 
       def fetch_rows(sql)
         execute(sql) do |result|

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'spark'
+
+module Sequel
+
+  module Hexspace
+
+    module DatabaseMethods
+
+      include Sequel::Spark::DatabaseMethods
+
+    end
+
+    module DatasetMethods
+
+      include Sequel::Spark::DatasetMethods
+
+    end
+
+  end
+
+  Sequel::Database.set_shared_adapter_scheme(:hexspace, Sequel::Hexspace)
+
+end

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

@@ -28,7 +28,7 @@ module Sequel
         # ignoring the primary key setting.
         {:type=>Integer}
       end
- 
+
       def supports_create_table_if_not_exists?
         true
       end
@@ -116,8 +116,23 @@ module Sequel
         sql
       end
 
+      def create_table_prefix_sql(name, options)
+        sql = String.new
+        sql << 'CREATE '
+        sql << 'EXTERNAL ' if options[:external]
+        sql << 'TEMPORARY ' if options[:temp]
+        sql << 'TABLE '
+        sql << 'IF NOT EXISTS ' if options[:if_not_exists]
+        sql << quote_schema_table(name)
+        sql
+      end
+
       def create_table_sql(name, generator, options)
-        _append_table_view_options_sql(super, options)
+        if options[:like] || (options[:using] && generator.columns.empty?)
+          _append_table_view_options_sql(create_table_prefix_sql(name, options), options)
+        else
+          _append_table_view_options_sql(super, options)
+        end
       end
 
       def create_table_as_sql(name, sql, options)
@@ -142,10 +157,18 @@ module Sequel
       end
 
       def _append_table_view_options_sql(sql, options)
+        if like = options[:like]
+          sql << " LIKE " << literal(like)
+        end
+
         if options[:using]
           sql << " USING " << options[:using].to_s
         end
 
+        if location = options[:location]
+          sql << " LOCATION " << literal(location)
+        end
+
         if options[:partitioned_by]
           sql << " PARTITIONED BY "
           _append_column_list_sql(sql, options[:partitioned_by])
@@ -175,7 +198,7 @@ module Sequel
       end
 
       def _append_column_list_sql(sql, columns)
-        sql << '(' 
+        sql << '('
         schema_utility_dataset.send(:identifier_list_append, sql, Array(columns))
         sql << ')'
       end
@@ -189,6 +212,12 @@ module Sequel
         sql
       end
 
+      # Spark SQL does not support CASCADE on DROP TABLE.
+      # Support :purge option, ignore :cascade.
+      def drop_table_sql(name, options)
+        "DROP TABLE#{' IF EXISTS' if options[:if_exists]} #{quote_schema_table(name)}#{' PURGE' if options[:purge]}"
+      end
+
       def schema_parse_table(table, opts)
         m = output_identifier_meth(opts[:dataset])
         im = input_identifier_meth(opts[:dataset])
@@ -243,6 +272,17 @@ module Sequel
         literal_append(sql, expr)
       end
 
+      # Route prepared statement / bound variable deletes through the
+      # emulated delete path, since Spark does not support native DELETE.
+      def call(type, bind_variables=OPTS, *values, &)
+        if type == :delete
+          ps = to_prepared_statement(type, values, :extend=>send(:bound_variable_modules))
+          ps.bind(bind_variables).delete
+        else
+          super
+        end
+      end
+
       # Emulate delete by selecting all rows except the ones being deleted
       # into a new table, drop the current table, and rename the new
       # table to the current table name.
@@ -310,7 +350,7 @@ module Sequel
         true
       end
 
-      def insert_supports_empty_values? 
+      def insert_supports_empty_values?
         false
       end
 
@@ -318,6 +358,24 @@ module Sequel
         sql << "to_binary('" << [v].pack("m*").gsub("\n", "") << "', 'base64')"
       end
 
+      # Spark requires DATE 'YYYY-MM-DD' syntax instead of plain quoted strings
+      def literal_date_append(sql, v)
+        sql << "DATE "
+        super
+      end
+
+      # Spark requires TIMESTAMP 'YYYY-MM-DD HH:MM:SS' syntax instead of plain quoted strings
+      def literal_time_append(sql, v)
+        sql << "TIMESTAMP "
+        super
+      end
+
+      # Spark requires TIMESTAMP 'YYYY-MM-DD HH:MM:SS' syntax instead of plain quoted strings
+      def literal_datetime_append(sql, v)
+        sql << "TIMESTAMP "
+        super
+      end
+
       def literal_false
         "false"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-hexspace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
+- Ryan Duryea
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -38,6 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: thrift
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
@@ -94,25 +114,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |
   This is a hexspace adapter for Sequel, designed to be used with Spark (not
   Hive). You can use the hexspace:// protocol in the Sequel connection URL
   to use this adapter.
-email: code@jeremyevans.net
+email: aguynamedryan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
+- CHANGELOG.md
 - LICENSE
 - README
 - lib/sequel/adapters/hexspace.rb
+- lib/sequel/adapters/shared/hexspace.rb
 - lib/sequel/adapters/shared/spark.rb
-homepage: https://github.com/jeremyevans/sequel-hexspace.git
+homepage: https://github.com/outcomesinsights/sequel-hexspace
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--quiet"
 - "--line-numbers"
@@ -127,15 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Sequel adapter for hexspace driver and Apache Spark database
 test_files: []