rokaki 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2659a359499939511a45107cc281e2aecce654ecf587f668e9de52d6fd8e3424
-  data.tar.gz: 4a5dfa2b6eef83fb731bb558575bdd5072b2c5ff2f4dc3670b11cae9487447ff
+  metadata.gz: ed3b16c71be49df063699af31b64190d9aa2db724bd5f6310e458aa33f63025a
+  data.tar.gz: c81607decccf33f1e9a71b1e68c3bd478428b22a1f375f9e5554b39ddfc0d8d6
 SHA512:
-  metadata.gz: a120036a6621d1ca69631d95fccd5fa3fac82cbb4a630bffcc5a5ea87ec026ef416fda109964eec929d1c8874af7a4dc08e06bab2cd1789779332ae9796b645e
-  data.tar.gz: 656df3353ae9593cdeaa75ce0b0111728fbbb420d8c4885928fcc334369ceaa07ea09f78a49b93b3ab45ea8d5767b81f9280cd9cf55260690a0a34270947c7ab
+  metadata.gz: 18d022ef801a2a978f01d1f142c34fb95171131d30f8f8cbe8837a60fc9ea44c162d48e9f672380a965f578de65b568124686399974918497141e0eca549b29a
+  data.tar.gz: 77f547a998d588d4128f6df533ae0e555c8561b402e496b53b66c7daee87e42a7ed3b2152ef5101930abd568ee2b0b268aeb71bb75d841feabb102238d776f49

data/.github/workflows/spec.yml

@@ -35,21 +35,67 @@ jobs:
           - 1433:1433
         # No built-in healthcheck; we'll wait in a step using nc
 
+      oracle:
+        image: gvenzl/oracle-free:23-slim
+        env:
+          ORACLE_PASSWORD: "oracle"
+          APP_USER: ROKAKI
+          APP_USER_PASSWORD: rokaki
+        ports:
+          - 1521:1521
+
     steps:
       - uses: actions/checkout@v2
 
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libpq-dev default-libmysqlclient-dev freetds-dev netcat-openbsd
+          sudo apt-get install -y build-essential libpq-dev default-libmysqlclient-dev freetds-dev netcat-openbsd unzip curl libaio1t64 libaio-dev
+          sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          # Not needed with a .ruby-version file
           ruby-version: 3.3.0
-          # runs 'bundle install' and caches installed gems automatically
-          bundler-cache: true
+          bundler-cache: false # we'll run bundle after Instant Client is present
+
+      - name: Install Oracle Instant Client (ZIP Basic Lite + SDK)
+        run: |
+          set -e
+          sudo mkdir -p /opt/oracle && cd /opt/oracle
+          # Download current 23.5 ZIPs directly from Oracle
+          curl -fL -o ic-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2326000/instantclient-basic-linux.x64-23.26.0.0.0.zip
+          curl -fL -o ic-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2326000/instantclient-sdk-linux.x64-23.26.0.0.0.zip
+          sudo unzip -q -o ic-basic.zip
+          sudo unzip -q -o ic-sdk.zip
+          ls /opt/oracle
+          cd /opt/oracle/instantclient_23_26 && sudo ln -s ../instantclient_23_26 lib
+          cd /opt/oracle/instantclient_23_26 && sudo ln -s sdk/include include
+          IC_DIR=/opt/oracle/instantclient_23_26
+          echo "OCI_DIR=$IC_DIR" | sudo tee -a $GITHUB_ENV
+          echo "OCI_LIB_DIR=$IC_DIR" | sudo tee -a $GITHUB_ENV
+          echo "OCI_INC_DIR=$IC_DIR/sdk/include" | sudo tee -a $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$IC_DIR:$LD_LIBRARY_PATH" | sudo tee -a $GITHUB_ENV
+
+      - name: Bundle install (after Instant Client)
+        id: bundleInstallAfterInstantClient
+        env:
+          ORACLE_HOME: /opt/oracle/instantclient_23_26
+          OCI_DIR: ${{ env.OCI_DIR }}
+          OCI_LIB_DIR: ${{ env.OCI_LIB_DIR }}
+          OCI_INC_DIR: ${{ env.OCI_INC_DIR }}
+          LD_LIBRARY_PATH: ${{ env.LD_LIBRARY_PATH }}
+        run: |
+          ls /opt/oracle/instantclient_23_26
+          bundle config set build.ruby-oci8 "--with-instant-client-dir=/opt/oracle/instantclient_23_26 --with-instant-client-include=/opt/oracle/instantclient_23_26/sdk/include --with-instant-client-lib=/opt/oracle/instantclient_23_26"
+          bundle install --jobs 4 --retry 3
+
+      - name: Archive Build Artifact
+        if: failure() && steps.bundleInstallAfterInstantClient.outcome == 'failure'
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-mkmf-log
+          path: /opt/hostedtoolcache/Ruby/3.3.0/x64/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/ruby-oci8-2.2.14/mkmf.log
 
       - name: Wait for databases to be ready
         shell: bash
@@ -63,7 +109,24 @@ jobs:
           for i in {1..120}; do
             nc -z 127.0.0.1 1433 && echo "SQL Server up" && break || sleep 1
           done
+          for i in {1..180}; do
+            nc -z 127.0.0.1 1521 && echo "Oracle up" && break || sleep 1
+          done
 
       - name: Run tests
+        env:
+          POSTGRES_HOST: 127.0.0.1
+          POSTGRES_USERNAME: postgres
+          POSTGRES_PASSWORD: postgres
+          SQLSERVER_HOST: 127.0.0.1
+          SQLSERVER_PORT: 1433
+          SQLSERVER_USERNAME: sa
+          SQLSERVER_PASSWORD: 5QL5£rv£r
+          ORACLE_HOST: 127.0.0.1
+          ORACLE_PORT: 1521
+          ORACLE_DATABASE: /freepdb1
+          ORACLE_USERNAME: ROKAKI
+          ORACLE_PASSWORD: rokaki
+          LD_LIBRARY_PATH: ${{ env.LD_LIBRARY_PATH }}
         run: |
           ./spec/ordered_run.sh

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rokaki (0.13.0)
+    rokaki (0.14.0)
       activesupport
 
 GEM
@@ -13,6 +13,10 @@ GEM
       activemodel (= 8.0.3)
       activesupport (= 8.0.3)
       timeout (>= 0.4.0)
+    activerecord-oracle_enhanced-adapter (8.0.0)
+      activerecord (~> 8.0.0)
+      ruby-oci8
+      ruby-plsql (>= 0.6.0)
     activerecord-sqlserver-adapter (8.0.9)
       activerecord (~> 8.0.0)
       tiny_tds
@@ -30,8 +34,8 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    benchmark (0.5.0)
+    bigdecimal (3.3.1)
     byebug (12.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
@@ -42,7 +46,7 @@ GEM
     database_cleaner-core (2.0.1)
     diff-lcs (1.6.2)
     drb (2.2.3)
-    factory_bot (6.5.5)
+    factory_bot (6.5.6)
       activesupport (>= 6.1.0)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-aarch64-linux-musl)
@@ -81,7 +85,7 @@ GEM
     logger (1.7.0)
     lumberjack (1.4.2)
     method_source (1.1.0)
-    minitest (5.25.5)
+    minitest (5.26.0)
     mysql2 (0.5.7)
       bigdecimal
     nenv (0.3.0)
@@ -108,19 +112,21 @@ GEM
       ffi (~> 1.0)
     reline (0.6.2)
       io-console (~> 0.5)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
+    ruby-oci8 (2.2.14)
+    ruby-plsql (0.8.0)
     securerandom (0.4.1)
     shellany (0.0.1)
     sqlite3 (2.7.4-aarch64-linux-gnu)
@@ -147,7 +153,7 @@ GEM
       bigdecimal (~> 3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.0.4)
 
 PLATFORMS
   aarch64-linux
@@ -164,7 +170,8 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 7.1, < 9.0)
+  activerecord-oracle_enhanced-adapter (~> 8.0.0)
   activerecord-sqlserver-adapter
   bundler (~> 2.0)
   database_cleaner-active_record
@@ -178,6 +185,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rokaki!
   rspec (~> 3.0)
+  ruby-oci8
   sqlite3
   tiny_tds
 

data/docs/adapters.md

@@ -4,7 +4,7 @@ title: Database adapters
 permalink: /adapters
 ---
 
-Rokaki generates adapter‑aware SQL for PostgreSQL, MySQL, and SQL Server.
+Rokaki generates adapter‑aware SQL for PostgreSQL, MySQL, SQL Server, and Oracle.
 
 ## Overview
 

data/lib/rokaki/filter_model/basic_filter.rb

@@ -40,6 +40,8 @@ module Rokaki
           'LIKE BINARY'
         elsif db == :sqlserver
           'LIKE'
+        elsif db == :oracle
+          'LIKE'
         else
           'LIKE'
         end
@@ -52,6 +54,9 @@ module Rokaki
           'LIKE'
         elsif db == :sqlserver
           'LIKE'
+        elsif db == :oracle
+          # Use 'ILIKE' as a signal; oracle_like will translate to UPPER(column) LIKE UPPER(:q)
+          'ILIKE'
         else
           'LIKE'
         end
@@ -105,6 +110,9 @@ module Rokaki
         elsif db == :sqlserver
           # Delegate to helper that supports arrays and escaping with ESCAPE
           query = "sqlserver_like(@model, \"#{key}\", \"#{type}\", #{filter}, :#{mode})"
+        elsif db == :oracle
+          # Oracle helper handles case-insensitive via UPPER() when type is 'ILIKE'
+          query = "oracle_like(@model, \"#{key}\", \"#{type}\", #{filter}, :#{mode})"
         else
           query = "@model.where(\"#{key} #{type} :query\", "
           query += "query: \"%\#{#{filter}}%\")" if mode == :circumfix

data/lib/rokaki/filter_model/nested_filter.rb

@@ -139,10 +139,11 @@ module Rokaki
         where = where.join
 
         if search_mode
-          if db == :sqlserver
+          if db == :sqlserver || db == :oracle
             key_leaf = "#{keys.last.to_s.pluralize}.#{leaf}"
+            helper = db == :sqlserver ? 'sqlserver_like' : 'oracle_like'
             @filter_methods << "def #{prefix}filter#{infix}#{name};"\
-              "sqlserver_like(@model.joins(#{joins}), \"#{key_leaf}\", \"#{type}\", #{prefix}#{name}, :#{search_mode}); end;"
+              "#{helper}(@model.joins(#{joins}), \"#{key_leaf}\", \"#{type}\", #{prefix}#{name}, :#{search_mode}); end;"
 
             @filter_templates << "@model = #{prefix}filter#{infix}#{name} if #{prefix}#{name};"
           else

data/lib/rokaki/filter_model/nested_like_filters.rb

@@ -197,7 +197,7 @@ module Rokaki
         # Compute key_leaf (qualified column) like other branches
         key_leaf = keys.last ? "#{keys.last.to_s.pluralize}.#{leaf}" : leaf
 
-        if db == :sqlserver
+        if db == :sqlserver || db == :oracle
           # Build relation base with joins
           if join_map.empty?
             rel_expr = "@model"
@@ -207,7 +207,11 @@ module Rokaki
             rel_expr = "@model.joins(**#{join_map})"
           end
 
-          filter_query = "sqlserver_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          if db == :sqlserver
+            filter_query = "sqlserver_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          else
+            filter_query = "oracle_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          end
         else
           query = build_like_query(
             type: type,

data/lib/rokaki/filter_model.rb

@@ -69,6 +69,27 @@ module Rokaki
       end
     end
 
+    # Compose an Oracle LIKE relation supporting arrays of terms and case-insensitive path via UPPER()
+    # type_signal: 'LIKE' for case-sensitive semantics; 'ILIKE' to indicate case-insensitive (we will translate)
+    def oracle_like(model, column, type_signal, value, mode)
+      terms = prepare_like_terms(value, mode)
+      ci = (type_signal.to_s.upcase == 'ILIKE')
+      col_expr = ci ? "UPPER(#{column})" : column
+      build_term = proc { |t| ci ? t.to_s.upcase : t }
+
+      if terms.is_a?(Array)
+        return model.none if terms.empty?
+        first = build_term.call(terms[0])
+        rel = model.where("#{col_expr} LIKE :q0 ESCAPE '\\'", q0: first)
+        terms[1..-1]&.each_with_index do |t, i|
+          rel = rel.or(model.where("#{col_expr} LIKE :q#{i + 1} ESCAPE '\\'", "q#{i + 1}".to_sym => build_term.call(t)))
+        end
+        rel
+      else
+        model.where("#{col_expr} LIKE :q ESCAPE '\\'", q: build_term.call(terms))
+      end
+    end
+
     def prepare_regex_terms(param, mode)
       if Array === param
         param_map = param.map { |term| ".*#{term}.*" } if mode == :circumfix
@@ -327,6 +348,8 @@ module Rokaki
           'REGEXP'
         elsif @_filter_db == :sqlserver
           'LIKE'
+        elsif @_filter_db == :oracle
+          'LIKE'
         else
           'LIKE'
         end
@@ -340,6 +363,9 @@ module Rokaki
           'REGEXP'
         elsif @_filter_db == :sqlserver
           'LIKE'
+        elsif @_filter_db == :oracle
+          # Use 'ILIKE' as a signal for case-insensitive; oracle_like will translate to UPPER(column) LIKE UPPER(:q)
+          'ILIKE'
         else
           'LIKE'
         end

data/lib/rokaki/filterable.rb

@@ -77,7 +77,7 @@ module Rokaki
         @filter_key_prefix ||= prefix
       end
 
-      def filter_key_infix(infix = :_)
+      def filter_key_infix(infix = :__)
         @filter_key_infix ||= infix
       end
 
@@ -170,6 +170,8 @@ module Rokaki
       # Enhance `filters` to support block mode accumulation
       def filters(*filter_keys)
         if instance_variable_defined?(:@__in_filterable_block) && @__in_filterable_block
+          @__block_filters ||= []
+          @__ctx_stack ||= []
           filter_keys.each do |fk|
             @__block_filters << wrap_in_context(fk)
           end

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/rokaki.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activerecord', '>= 7.1', '< 9.0'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
@@ -50,5 +50,8 @@ Gem::Specification.new do |spec|
   # For SQL Server testing
   spec.add_development_dependency 'tiny_tds'
   spec.add_development_dependency 'activerecord-sqlserver-adapter'
+  # For Oracle testing (optional). Enable by setting WITH_ORACLE=1 before bundling.
+  spec.add_development_dependency 'ruby-oci8'
+  spec.add_development_dependency 'activerecord-oracle_enhanced-adapter', '~> 8.0.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Steve Martin
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +240,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-oracle_enhanced-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 description: A dsl for filtering data in web requests
 email:
 - steve@martian.media