sequel-jdbc-as400 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 537734a668a237cd882400f92fe761ac938afbd7
-  data.tar.gz: e473e1cfb9b2be6657d455f408c23c52e56f7a7a
+SHA256:
+  metadata.gz: a284da82cc1e842954e0378840427b8d2e6338b2b22f81721dc8e4b2ad2594bb
+  data.tar.gz: 8499ec0299e608847b727183c29c234cee19a1494495d6fe9616c4e7a611a695
 SHA512:
-  metadata.gz: b9111bd38ac66da365fbd1a41f9e56b279cd36cbbe20f9b1a6a04cefa97b5f136ebd04fe26fc32203d4d604691c056d6da000e1ae0e1cb2dfecde2a5db6e52a6
-  data.tar.gz: 1dedd0ba0f0a21b3621e6c883f104bf86c2827e76d6b0ab64670cae3693b0da696fd21957e242bd9224b93da6d1d13e593d10e8bf30e8eea282759b7aeafdef4
+  metadata.gz: a114aba34d2fac4b5bc7752b687c876da5ecccca33b608d64e6d752a3d994596cefb3dcbb567e94154af84f708ae689302b15624b212e1647e10a7a332f66809
+  data.tar.gz: 990f130586e2876ece91c52abb2366bf63ca2b90ec7b4460b553a2af1db0843fa9e23695f0abf04253f3149cc5fcbc6b31b313fbcce446b77e3558182aaf59a9

data/.ruby-version

@@ -1 +1 @@
-jruby-9.1.8.0
+jruby-9.1.15.0

data/README.md

@@ -1,10 +1,15 @@
-[![Build Status](https://travis-ci.org/ecraft/sequel-jdbc-as400.svg?branch=master)](https://travis-ci.org/ecraft/sequel-jdbc-as400)
+[![Gem Version](https://badge.fury.io/rb/sequel-jdbc-as400.svg)](https://badge.fury.io/rb/sequel-jdbc-as400) [![Build Status](https://travis-ci.org/ecraft/sequel-jdbc-as400.svg?branch=master)](https://travis-ci.org/ecraft/sequel-jdbc-as400) 
 
 # sequel-jdbc-as400
 
 JDBC AS400 adapter for the [Sequel](https://github.com/jeremyevans/sequel) Ruby gem
 
-This gem is a fork of the code which used to be a part of the Sequel codebase, but which was removed as of Sequel 5. (unreleased at the time of writing) If your application relies on the as400 adapter, use this gem together with `sequel` to still be able to connect to AS400 databases.
+This gem is a fork of the code which used to be a part of the Sequel codebase, but which was removed as of Sequel 5. If your application relies on the as400 adapter, use this gem together with `sequel` to still be able to connect to AS400 databases.
+
+## Requirements
+
+* Ruby 2.1 or greater.
+* Sequel 5.0 or greater.
 
 ## Development
 
@@ -13,7 +18,7 @@ $ bundle install
 $ CONNECTION_STRING="jdbc:as400://server-name/;prompt=false;user=login;password=pw;libraries=DBNAME;query timeout mechanism=cancel; bundle exec rspec
 ```
 
-(replace the connection string with a real one, pointing at a AS400 DB2 server.)
+(replace the connection string with a real one, pointing at an AS400/iSeries DB2 server.)
 
 ## Releasing a new gem version
 

data/Rakefile

@@ -8,4 +8,4 @@ end
 
 RuboCop::RakeTask.new
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/lib/sequel/jdbc/as400.rb

@@ -4,7 +4,6 @@ require 'jdbc/jt400'
 Jdbc::JT400.load_driver
 
 Sequel.require 'adapters/jdbc/transactions'
-Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
   module JDBC
@@ -59,8 +58,6 @@ module Sequel
 
       # Dataset class for AS400 datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        include EmulateOffsetWithRowNumber
-
         WILDCARD = Sequel::LiteralString.new('*').freeze
         Sequel::Deprecation.deprecate_constant(self, :WILDCARD)
         FETCH_FIRST_ROW_ONLY = ' FETCH FIRST ROW ONLY'.freeze
@@ -71,7 +68,13 @@ module Sequel
         Sequel::Deprecation.deprecate_constant(self, :ROWS_ONLY)
 
         # Modify the sql to limit the number of rows returned
-        def select_limit_sql(sql)
+        def select_limit_sql(sql) # rubocop:disable MethodLength
+          o = @opts[:offset]
+          if o
+            sql << ' OFFSET '
+            literal_append(sql, o)
+            sql << ' ROWS'
+          end
           l = @opts[:limit]
           return unless l
 

data/lib/sequel/jdbc/as400/version.rb

@@ -1,7 +1,7 @@
 module Sequel
   module JDBC
     module AS400
-      VERSION = '1.0.0'.freeze
+      VERSION = '1.1.0'.freeze
     end
   end
 end

data/sequel-jdbc-as400.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path('../lib/sequel/jdbc/as400/version', __FILE__)
+require File.expand_path('lib/sequel/jdbc/as400/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name = 'sequel-jdbc-as400'
@@ -9,17 +9,19 @@ Gem::Specification.new do |s|
   s.author = 'Jeremy Evans and contributors'
   s.homepage = 'https://github.com/ecraft/sequel-jdbc-as400'
   s.license = 'MIT'
-  s.required_ruby_version = '>= 1.8.7'
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.required_ruby_version = '>= 2.1'
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
+    %w[.travis.yml .rubocop.yml]
   s.require_path = 'lib'
   s.bindir = 'bin'
 
-  s.add_runtime_dependency 'jdbc-jt400'
+  s.add_runtime_dependency 'jdbc-jt400', '~> 9.1'
   s.add_runtime_dependency 'sequel', '~> 5.0'
+
   s.add_development_dependency 'activemodel'
   s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'tzinfo'
-  s.add_development_dependency 'rake'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sequel-jdbc-as400
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Evans and contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.1'
   name: jdbc-jt400
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
+  name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop
+  name: rspec
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: tzinfo
+  name: rubocop
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
+  name: tzinfo
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,9 +130,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -152,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -160,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: 'The Database Toolkit for Ruby: JDBC AS400 driver'

data/.rubocop.yml

@@ -1,41 +0,0 @@
-AllCops:
-  TargetRubyVersion: 1.9
-  DisplayCopNames: true
-
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-Metrics/LineLength:
-  Max: 132
-Metrics/MethodLength:
-  Severity: warning
-
-# Rationale: allow Weirich-style blocks
-Style/BlockDelimiters:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/Encoding:
-  Enabled: false
-Style/FileName:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-Style/NumericPredicate:
-  Enabled: false
-
-# Default in v0.48.1, but older versions are being used for older Ruby versions, so we set this explicitly here to have the same
-# settings on all Ruby versions.
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    default: ()
-    '%i': '[]'
-    '%I': '[]'
-    '%r': '{}'
-    '%w': '[]'
-    '%W': '[]'

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - jruby-19mode
-  - jruby-9.0.5.0
-  - jruby-9.1.8.0
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-before_install:
-  - gem install bundler
-script: bundle exec rake