sequelizer 0.1.4 → 0.2.0

data/test/lib/sequelizer/test_options.rb

@@ -1,8 +1,8 @@
 require_relative '../../test_helper'
 require 'sequelizer/options'
 
-
 class TestOptions < Minitest::Test
+
   def test_changes_postgresql_adapter_to_postgres
     options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgresql'))
 
@@ -30,19 +30,22 @@ class TestOptions < Minitest::Test
   end
 
   def test_prefers_search_path_over_schema_search_path
-    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path', schema_search_path: 'path2'))
+    options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path',
+                                                                  schema_search_path: 'path2'))
 
     assert_equal('path', options.search_path)
   end
 
   def test_returns_timeout_as_an_integer_even_if_given_string
-    options = Sequelizer::Options.new({timeout: "30"})
+    options = Sequelizer::Options.new({ timeout: '30' })
+
     assert_equal(30, options.to_hash[:timeout])
   end
 
   def test_returns_a_hash_even_if_given_nil
     Sequelizer::YamlConfig.stub :user_config_path, Pathname.new('/completely/made/up/path/that/does/not/exist') do
       options = Sequelizer::Options.new
+
       assert_equal(1, options.to_hash.length)
       assert_instance_of(Proc, options.to_hash[:after_connect])
     end
@@ -50,6 +53,7 @@ class TestOptions < Minitest::Test
 
   def test_handles_symbolized_search_path
     options = Sequelizer::Options.new(search_path: 'passed', adapter: 'postgres')
+
     assert_equal 'passed', options.search_path
   end
 
@@ -60,19 +64,48 @@ class TestOptions < Minitest::Test
     conny.expect :db, db
     conny.expect :db, db
 
-    procky = Proc.new { |conn| conn.db[:table].to_a }
+    procky = proc { |conn| conn.db[:table].to_a }
 
     options = Sequelizer::Options.new(after_connect: procky)
     options.to_hash[:after_connect].call(conny, :default, db)
 
-    assert_equal(["SELECT * FROM \"table\""], db.sqls)
+    assert_equal(['SELECT * FROM "table"'], db.sqls)
+  end
+
+  def test_url_based_connection_processes_search_path
+    options = Sequelizer::Options.new(
+      Sequelizer::OptionsHash.new(url: 'postgres://localhost/mydb', search_path: 'my_schema'),
+    )
+
+    assert_equal('my_schema', options.search_path)
+    assert_instance_of(Proc, options.to_hash[:after_connect])
+  end
+
+  def test_url_based_connection_processes_schema_as_search_path
+    options = Sequelizer::Options.new(
+      Sequelizer::OptionsHash.new(url: 'postgresql://localhost/mydb', schema: 'my_schema'),
+    )
+
+    assert_equal('my_schema', options.search_path)
+  end
+
+  def test_url_based_connection_skips_search_path_processing_for_non_postgres
+    options = Sequelizer::Options.new(
+      Sequelizer::OptionsHash.new(url: 'mysql2://localhost/mydb', search_path: 'my_schema'),
+    )
+
+    # search_path key remains but is NOT processed (no schema creation callback)
+    assert_equal('my_schema', options.search_path)
+    # adapter should not be normalized to 'postgres'
+    assert_nil(options.adapter)
   end
 
   def test_handles_extensions_passed_in
-    options = Sequelizer::Options.new(extension_example_1: 1, extension_example_2: 1, not_an_extension_example: 1)
+    options = Sequelizer::Options.new(extension_example_one: 1, extension_example_two: 1, not_an_extension_example: 1)
+
     assert_equal 1, options.to_hash[:not_an_extension_example]
-    assert options.extensions.include?(:example_1), "Failed to find example_1 in extensions"
-    assert options.extensions.include?(:example_2), "Failed to find example_2 in extensions"
+    assert_includes options.extensions, :example_one, 'Failed to find example_one in extensions'
+    assert_includes options.extensions, :example_two, 'Failed to find example_two in extensions'
   end
-end
 
+end

data/test/lib/sequelizer/test_yaml_config.rb

@@ -1,21 +1,19 @@
 require_relative '../../test_helper'
 require 'sequelizer/yaml_config'
 
-
 class TestYamlConfig < Minitest::Test
+
   def setup
     @yaml_config = Sequelizer::YamlConfig.new
   end
 
-  def with_empty_env
+  def with_empty_env(&)
     env_mock = Minitest::Mock.new
     env_mock.expect :[], nil, ['SEQUELIZER_ENV']
     env_mock.expect :[], nil, ['RAILS_ENV']
     env_mock.expect :[], nil, ['RACK_ENV']
 
-    stub_const(Sequelizer::YamlConfig, :ENV, env_mock) do
-      yield
-    end
+    stub_const(Sequelizer::YamlConfig, :ENV, env_mock, &)
 
     env_mock.verify
   end
@@ -41,7 +39,7 @@ class TestYamlConfig < Minitest::Test
     file_mock = Minitest::Mock.new
     file_mock.expect :exist?, true
     @yaml_config.stub :config_file_path, file_mock do
-      @yaml_config.stub :config, {'development' => { 'adapter' => 'sqlite' }} do
+      @yaml_config.stub :config, { 'development' => { 'adapter' => 'sqlite' } } do
         with_empty_env do
           assert_equal({ 'adapter' => 'sqlite' }, @yaml_config.options)
         end
@@ -51,27 +49,29 @@ class TestYamlConfig < Minitest::Test
   end
 
   def test_options_default_to_empty_hash
-    assert_equal(@yaml_config.options, {})
+    assert_empty(@yaml_config.options)
   end
 
   def test_path_defaults_to_local_config
-    assert_equal(@yaml_config.config_file_path, Pathname.pwd + "config" + "sequelizer.yml")
+    assert_equal(@yaml_config.config_file_path, Pathname.pwd.join('config', 'sequelizer.yml'))
   end
 
   def test_path_can_be_fed_pathanem_from_initialize
-    assert_equal(Sequelizer::YamlConfig.new(Pathname.new("~") + ".config").config_file_path, Pathname.new("~").expand_path + ".config")
+    assert_equal(Sequelizer::YamlConfig.new(Pathname.new('~').join('.config')).config_file_path,
+                 Pathname.new('~').expand_path.join('.config'))
   end
 
   def test_path_can_be_fed_string_from_initialize
-    assert_equal(Sequelizer::YamlConfig.new("~/.config").config_file_path, Pathname.new("~").expand_path + ".config")
+    assert_equal(Sequelizer::YamlConfig.new('~/.config').config_file_path, Pathname.new('~/.config').expand_path)
   end
 
   def test_local_is_current_directory
-    assert_equal(Sequelizer::YamlConfig.local_config.config_file_path, Pathname.pwd + "config" + "sequelizer.yml")
+    assert_equal(Sequelizer::YamlConfig.local_config.config_file_path, Pathname.pwd.join('config', 'sequelizer.yml'))
   end
 
   def test_home_uses_home_directory
-    assert_equal(Sequelizer::YamlConfig.user_config.config_file_path, Pathname.new("~").expand_path + ".config" + "sequelizer" + "database.yml")
+    assert_equal(Sequelizer::YamlConfig.user_config.config_file_path,
+                 Pathname.new(Dir.home).join('.config', 'sequelizer', 'database.yml'))
   end
 
   def test_environment_checks_environment_variables
@@ -79,4 +79,5 @@ class TestYamlConfig < Minitest::Test
       assert_equal 'development', @yaml_config.environment
     end
   end
+
 end

data/test/test_helper.rb

@@ -1,16 +1,45 @@
+# Disable Rails plugins for Minitest to avoid version conflicts
+ENV['MT_NO_PLUGINS'] = '1'
+
+# SimpleCov must be loaded before application code
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter '/test/'
+  add_filter '/vendor/'
+
+  add_group 'Core', 'lib/sequelizer'
+  add_group 'Sequel Extensions', 'lib/sequel'
+
+  # Temporarily lower minimum coverage to see what we're working with
+  minimum_coverage 70
+  minimum_coverage_by_file 40
+
+  # Generate both HTML and JSON for easier analysis
+  formatter SimpleCov::Formatter::MultiFormatter.new([
+                                                       SimpleCov::Formatter::HTMLFormatter,
+                                                       SimpleCov::Formatter::SimpleFormatter,
+                                                     ])
+end
+
 require 'minitest/autorun'
-require "sequel"
+require 'minitest/mock'
+require 'sequel'
+
+module Minitest
+  class Test
+
+    def stub_const(klass, const, replace)
+      klass.send(:const_set, const, replace)
+      return unless block_given?
 
-class Minitest::Test
-  def stub_const(klass, const, replace, &block)
-    klass.send(:const_set, const, replace)
-    if block_given?
       yield
       remove_stubbed_const(klass, const)
     end
-  end
 
-  def remove_stubbed_const(klass, const)
-    klass.send(:remove_const, const)
+    def remove_stubbed_const(klass, const)
+      klass.send(:remove_const, const)
+    end
+
   end
 end

metadata

@@ -1,27 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Duryea
-autorequire: 
 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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -44,98 +43,228 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.27'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: kvcsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: pp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.93'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.93'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Easily establish a connection to a database via Sequel gem using options
   specified in config/database.yml or .env files
 email:
@@ -145,22 +274,54 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".beads/.gitignore"
+- ".beads/.jsonl.lock"
+- ".beads/.migration-hint-ts"
+- ".beads/README.md"
+- ".beads/config.yaml"
+- ".beads/issues.jsonl"
+- ".beads/metadata.json"
+- ".coderabbit.yaml"
+- ".devcontainer/.p10k.zsh"
+- ".devcontainer/.zshrc"
+- ".devcontainer/Dockerfile"
+- ".devcontainer/copy-claude-credentials.sh"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/init-firewall.sh"
+- ".devcontainer/setup-credentials.sh"
+- ".github/dependabot.yml"
+- ".github/workflows/dependabot-auto-merge.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".overcommit.yml"
+- ".rubocop.yml"
+- AGENTS.md
 - CHANGELOG.md
+- CLAUDE.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/sequelizer
+- config/platforms/base.csv
+- config/platforms/rdbms/athena.csv
+- config/platforms/rdbms/postgres.csv
+- config/platforms/rdbms/snowflake.csv
+- config/platforms/rdbms/spark.csv
 - examples/database.with_one_set_of_options.yml
 - examples/database.yml
 - examples/dot_env.txt
+- lib/sequel/extensions/cold_col.rb
 - lib/sequel/extensions/db_opts.rb
+- lib/sequel/extensions/funky.rb
 - lib/sequel/extensions/make_readyable.rb
+- lib/sequel/extensions/more_sql.rb
+- lib/sequel/extensions/platform.rb
 - lib/sequel/extensions/settable.rb
-- lib/sequel/extensions/sqls.rb
+- lib/sequel/extensions/sql_recorder.rb
+- lib/sequel/extensions/unionize.rb
 - lib/sequel/extensions/usable.rb
 - lib/sequelizer.rb
 - lib/sequelizer/cli.rb
@@ -173,8 +334,14 @@ files:
 - lib/sequelizer/version.rb
 - lib/sequelizer/yaml_config.rb
 - sequelizer.gemspec
+- test/lib/sequel/extensions/test_cold_col.rb
 - test/lib/sequel/extensions/test_db_opts.rb
 - test/lib/sequel/extensions/test_make_readyable.rb
+- test/lib/sequel/extensions/test_more_sql.rb
+- test/lib/sequel/extensions/test_platform.rb
+- test/lib/sequel/extensions/test_settable.rb
+- test/lib/sequel/extensions/test_sql_recorder.rb
+- test/lib/sequel/extensions/test_unionize.rb
 - test/lib/sequel/extensions/test_usable.rb
 - test/lib/sequelizer/test_connection_maker.rb
 - test/lib/sequelizer/test_env_config.rb
@@ -185,8 +352,8 @@ files:
 homepage: https://github.com/outcomesinsights/sequelizer
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -194,24 +361,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Sequel database connections via config/database.yml or .env
-test_files:
-- test/lib/sequel/extensions/test_db_opts.rb
-- test/lib/sequel/extensions/test_make_readyable.rb
-- test/lib/sequel/extensions/test_usable.rb
-- test/lib/sequelizer/test_connection_maker.rb
-- test/lib/sequelizer/test_env_config.rb
-- test/lib/sequelizer/test_gemfile_modifier.rb
-- test/lib/sequelizer/test_options.rb
-- test/lib/sequelizer/test_yaml_config.rb
-- test/test_helper.rb
+test_files: []

data/lib/sequel/extensions/sqls.rb

@@ -1,31 +0,0 @@
-# frozen-string-literal: true
-#
-# The sqls extension will record each SQL statement sent to the
-# database
-#
-#   DB.extension :sqls
-#   DB[:table]
-#   DB.sqls # =>  ["SELECT * FROM table LIMIT 1"]
-#
-# Related module: Sequel::Sqls
-
-module Sequel
-  module Sqls
-    attr_reader :sqls
-
-    # Record SQL statements when logging query.
-    def log_connection_yield(sql, conn, args=nil)
-      @sqls_mutex.synchronize{sqls.push(sql)}
-      super
-    end
-
-    def self.extended(db)
-      db.instance_exec do
-        @sqls_mutex ||= Mutex.new
-        @sqls ||= []
-      end
-    end
-  end
-
-  Database.register_extension(:sqls, Sqls)
-end