conceptql 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5201b0144372677675ffcd8abea73662b8e79544ffacfbbd1a61e39a9923d2da
-  data.tar.gz: b81fc6806c7aae55562b073e33b2f6704f36fd6cd57266ffe6b8055df6c6baa0
+  metadata.gz: 1958ad620e733aede026fc74e0c21f06a2376031b514d6a7736ef287eda9afc5
+  data.tar.gz: 0ed440d679a23994a83237d54120eabac40bbcd9d9b7499e8cfff18c076aabd8
 SHA512:
-  metadata.gz: 2a49e99ec315bac889401893e68a83de444ab6ac3307e3ae08897a07f7cd59f9a60e3f4f712cff0d43e4d50394d6ff921900e7c23f06f86fdd6134f691fd1d1f
-  data.tar.gz: bf260ffadecac3a5e0dbd8aeb6eb932258fdebcc709363be34704b8f74abde9bd092be0f5710208b4a84d362758087c0c7fb4bf72871f2bafce8fb9496d5fbf9
+  metadata.gz: f42b9ec69eefd01041c9eab5f3aa421aaf8fc63df0933df1e0ab79a9919f4e4da06f48338c96f6af51226fb567ce15f3355116a962dd757d111efd14bdf262da
+  data.tar.gz: c50c2a4934b10f457ea25fb317f7844ab98f5816f55ea09aad50f1cb9a24424b567f67abf4ec9585ac677435641db986947b2b78b33f388b4f46a1bdb6f9bcd8

data/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.4.1] - 2026-10-28
+
+### Changed
+
+- `Query#sql(:formatted)` formats SQL inside the Ruby process with the new runtime dependency
+  sequel-sqlformat (`~> 0.1`), a binding to the Rust `sqlformat` crate. It no longer starts
+  sql-formatter, pg_format or sqlformat once per statement. A large algorithm (78 statements)
+  now formats in about 0.13 s instead of about 8.3 s. Formatting changes only whitespace and
+  keyword case, for Postgres, DuckDB and Spark SQL. sequel-sqlformat ships precompiled gems
+  for Linux and macOS, so no Rust toolchain is needed.
+- The development dependency sequel-duckdb is now `~> 0.4.2` (was `~> 0.4.1`). 0.4.2 fixes
+  `create_or_replace_view` and drops support for the duckdb gem 1.5.x, which conceptql
+  already did not use.
+
+### Removed
+
+- `ConceptQL::SqlFormatters`, every adapter's `preferred_formatter`, and
+  `ConceptQL::Utils.timed_capture`. The external formatter programs are no longer used.
+- The test Docker image no longer installs the `sqlformat` package.
+
 ## [0.4.0] - 2026-10-26
 
 ### Added

data/lib/conceptql/query.rb

@@ -4,7 +4,7 @@ require "json"
 require "forwardable"
 require_relative "scope"
 require_relative "nodifier"
-require_relative "sql_formatters"
+require "sequel/sqlformat"
 
 module ConceptQL
   class Query
@@ -208,8 +208,11 @@ module ConceptQL
       end
     end
 
+    # Formats inside the Ruby process with the sequel-sqlformat gem (the Rust
+    # sqlformat crate). It changes only whitespace and keyword case, and it never
+    # fails on unknown syntax, so DuckDB and Spark SQL format too.
     def format(sql)
-      SqlFormatters.format(sql, rdbms)
+      Sequel::SQLFormat.format(sql, dialect: Sequel::SQLFormat.dialect_for(cdb.database_type), indent: 2, uppercase: true)
     end
   end
 end

data/lib/conceptql/rdbms/duckdb.rb

@@ -12,10 +12,6 @@ module ConceptQL
         Sequel.function(:datediff, "day", to, from)
       end
 
-      def preferred_formatter
-        SqlFormatters::PG_FORMAT
-      end
-
       # DuckDB accepts WITH ... AS MATERIALIZED since v0.8.0.
       def supports_materialized?
         true

data/lib/conceptql/rdbms/generic.rb

@@ -59,10 +59,6 @@ module ConceptQL
         end
       end
 
-      def preferred_formatter
-        SqlFormatters::SQL_FORMATTER
-      end
-
       # Returns from - to in days, NOT to - from, so datediff(later, earlier)
       # is positive. Every adapter keeps this order. This default emits
       # Spark's datediff(endDate, startDate), which returns endDate - startDate,

data/lib/conceptql/rdbms/postgres.rb

@@ -14,10 +14,6 @@ module ConceptQL
         db.vacuum_table(table_name, analyze: true) if analyze_temp_tables?
       end
 
-      def preferred_formatter
-        SqlFormatters::POSTGRES
-      end
-
       # DISTINCT ON is Postgres-only. The other adapters inherit
       # Generic#primary_concepts, which uses ROW_NUMBER() instead.
       def primary_concepts(db, all_primary_ids)

data/lib/conceptql/rdbms/spark.rb

@@ -13,10 +13,6 @@ module ConceptQL
       def null_safe_equal(lhs, rhs)
         Sequel.lit("(? <=> ?)", lhs, rhs)
       end
-
-      def preferred_formatter
-        SqlFormatters::PG_FORMAT
-      end
     end
   end
 end

data/lib/conceptql/utils.rb

@@ -4,8 +4,6 @@ require "active_support/core_ext/array/conversions"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
 require "json"
-require "open3"
-require "timeout"
 
 module ConceptQL
   module Utils
@@ -31,47 +29,6 @@ module ConceptQL
         end
       end
 
-      def timed_capture(*commands)
-        # Heavily adapted from:
-        # https://gist.github.com/lpar/1032297#gistcomment-1738285
-        opts = extract_opts!(commands)
-        timeout = opts.fetch(:timeout)
-
-        stdin, stdout, stderr, wait_thread = Open3.popen3(*commands)
-        wait_thread[:timed_out] = false
-        stdin.puts opts[:stdin_data] if opts[:stdin_data]
-        stdin.close
-
-        # Purposefully NOT using Timeout.rb because in general it is a dangerous API!
-        # http://blog.headius.com/2008/02/rubys-threadraise-threadkill-timeoutrb.html
-        Thread.new do
-          sleep timeout
-          if wait_thread.alive?
-            begin
-              wait_thread[:timed_out] = true
-              # please note: we are assuming the command will create ONE process (not handling subprocs / proc groups)
-              command = "kill -9 #{wait_thread.pid}"
-              system(command)
-            rescue(Errno::ESRCH)
-              # Do nothing!
-            end
-          end
-        end
-
-        if (es = wait_thread.value.exitstatus) && !es.zero?
-          raise stderr.read
-        end
-
-        out = stdout.read
-        stdout.close
-
-        if wait_thread[:timed_out]
-          raise Timeout::Error, "Command #{commands} failed to complete after #{timeout} seconds"
-        end
-
-        out
-      end
-
       def extract_opts!(arr)
         return {} unless arr.last.is_a?(Hash)
 

data/lib/conceptql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConceptQL
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conceptql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Duryea
@@ -79,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.66'
+- !ruby/object:Gem::Dependency
+  name: sequel-sqlformat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sequelizer
   requirement: !ruby/object:Gem::Requirement
@@ -416,8 +430,6 @@ files:
 - lib/conceptql/rdbms/postgres.rb
 - lib/conceptql/rdbms/spark.rb
 - lib/conceptql/scope.rb
-- lib/conceptql/sql_formatters.rb
-- lib/conceptql/sql_formatters/formatter.rb
 - lib/conceptql/utils.rb
 - lib/conceptql/utils_cli.rb
 - lib/conceptql/version.rb

data/lib/conceptql/sql_formatters/formatter.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module ConceptQL
-  module SqlFormatters
-    # An external SQL formatter, given as a command array that reads SQL on
-    # stdin, e.g. Formatter.new(%w[sql-formatter -l postgresql]).
-    class Formatter
-      attr_reader :command
-
-      def initialize(command)
-        @command = command
-      end
-
-      def available?
-        system("which", command.first, out: File::NULL, err: File::NULL)
-      end
-
-      def format(sql)
-        ConceptQL::Utils.timed_capture(*command, stdin_data: sql, timeout: 10)
-      rescue Timeout::Error
-        sql
-      end
-    end
-  end
-end

data/lib/conceptql/sql_formatters.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "sql_formatters/formatter"
-
-module ConceptQL
-  module SqlFormatters
-    SQL_FORMATTER = %w[sql-formatter].freeze
-    POSTGRES = %w[sql-formatter -l postgresql].freeze
-    SQLFORMAT = %w[sqlformat --reindent --use_space_around_operators --identifiers lower --keywords upper -].freeze
-    PG_FORMAT = %w[pg_format].freeze
-
-    # Formats with the rdbms's preferred formatter, else the first of the
-    # fallbacks that is installed, else returns the SQL untouched.
-    def self.format(sql, rdbms)
-      formatter = [ rdbms.preferred_formatter, SQL_FORMATTER, SQLFORMAT, PG_FORMAT ]
-                  .compact
-                  .map { |command| Formatter.new(command) }
-                  .detect(&:available?)
-      formatter ? formatter.format(sql) : sql
-    end
-  end
-end