activerecord-jdbcas400-adapter 1.3.5 → 1.3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2398fc7c8bad7ce1d3253f2e0f6a4a7b20d0ead
-  data.tar.gz: 413c9f4b32caf45437b3acb22a5352159af1c152
+  metadata.gz: c136b73119611c7dba20169f0921eb7225360c06
+  data.tar.gz: 0f36b3c6cd877923a4a8f055aa83e4b71a64e192
 SHA512:
-  metadata.gz: 6cacc8de3cf7d3b33e607007d5cbdd5d9b55dd6bb9cb358be734637076852d75ffb95bf2cea112bc7ee46817580ee4ce00261ed097073cb6674f5109028665f5
-  data.tar.gz: b57c5cb53826fa1d07a54576b9eae158e08f40fd348b58dd75f80814d9aad8c1718fb0d81a75a942779dd57e0d53c5c658295e8b885f8d7e8dbc0bf24b1e7c09
+  metadata.gz: 652c1cb9571c772449eb121a535077ea8939d7ffe4d36997cb0f840341c89b283ba62cdada59e68ac335c60e3225dbdac6574d07479fc50cc443acbb8b91a9c5
+  data.tar.gz: a6470d8d57f2c10b4470ffac84a9c42375ba3af0294632736bf2bac274badd9b1de625c87676d7b5f6e55523850d17d912a710e90834a5ac23f1549f6559ac78

data/README.md

@@ -6,6 +6,20 @@ https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter/
 
 This is an ActiveRecord driver for AS/400 using JDBC running under JRuby.
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'activerecord-jdbcas400-adapter'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install activerecord-jdbcas400-adapter
+
 ## Usage
 
 Configure your database.yml in the normal Rails style:

data/Rakefile

@@ -1,3 +1,2 @@
 require 'bundler/gem_helper'
 Bundler::GemHelper.install_tasks
-require File.expand_path '../../rakelib/bundler_ext', __FILE__

data/lib/arjdbc/as400/adapter.rb

@@ -41,7 +41,7 @@ module ArJdbc
       if config[:current_library]
         @connection.tables(nil, config[:current_library])
       else
-        @connection.tables(nil, db2_schema)
+        @connection.tables(nil, schema)
       end
     end
 
@@ -59,12 +59,9 @@ module ArJdbc
 
     # @override
     def prefetch_primary_key?(table_name = nil)
-      # TRUE if the table has no identity column
-      names = table_name.upcase.split(".")
-      sql = "SELECT 1 FROM SYSIBM.SQLPRIMARYKEYS WHERE "
-      sql << "TABLE_SCHEM = '#{names.first}' AND " if names.size == 2
-      sql << "TABLE_NAME = '#{names.last}'"
-      select_one(sql).nil?
+      return true if table_name.nil?
+      table_name = table_name.to_s
+      columns(table_name).count { |column| column.primary } == 0
     end
 
     # @override
@@ -113,29 +110,34 @@ module ArJdbc
     # Disable all schemas browsing
     def table_exists?(name)
       return false unless name
-      @connection.table_exists?(name, db2_schema)
+      @connection.table_exists?(name, schema)
     end
 
     def indexes(table_name, name = nil)
-      @connection.indexes(table_name, name, db2_schema)
+      @connection.indexes(table_name, name, schema)
     end
 
     DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
 
+    # Set schema is it specified
+    def configure_connection
+      set_schema(config[:schema]) if config[:schema]
+    end
+
     # Do not return *LIBL as schema
     def schema
-      system_naming? ? nil : db2_schema
+      db2_schema
     end
 
     private
     # If naming is really in system mode CURRENT_SCHEMA is *LIBL
     def system_naming?
-      @db2_schema == '*LIBL'
+      schema == '*LIBL'
     end
 
     # SET SCHEMA statement put connection in sql naming
     def set_schema(schema)
-      execute("SET SCHEMA #{schema}") unless system_naming?
+      execute("SET SCHEMA #{schema}")
     end
 
     # @override

data/test/test_adapter.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class TestAdapter < Test::Unit::TestCase
+  def test_prefetch_primary_key?
+    begin
+      connection.execute('CREATE TABLE test_table (test_column INTEGER)')
+      assert_true(connection.prefetch_primary_key?('test_table'))
+    ensure
+      connection.execute('DROP TABLE test_table')
+    end
+
+    begin
+      connection.execute('CREATE TABLE test_table (test_column INTEGER, PRIMARY KEY(test_column))')
+      assert_false(connection.prefetch_primary_key?('test_table'))
+    ensure
+      connection.execute('DROP TABLE test_table')
+    end
+  end
+end

data/test/test_connection.rb

@@ -7,11 +7,9 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_schema
-    assert_equal(connection.instance_eval {db2_schema}, config[:schema])
     assert_equal(connection.schema, config[:schema])
 
-    assert_equal(system_connection.instance_eval {db2_schema}, '*LIBL')
-    assert_nil(system_connection.schema)
+    assert_equal(system_connection.schema, '*LIBL')
   end
 
   def test_migration_support

data/test/test_database_tasks.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestConnection < Test::Unit::TestCase
+class TestDatabaseTasks < Test::Unit::TestCase
   def test_tasks_registered
     adapter_name = connection.config[:adapter]
     assert_nothing_raised do

data/test/test_helper.rb

@@ -1,8 +1,7 @@
 require 'java'
 
-require 'rubygems'
-require 'bundler/setup'
-Bundler.require(:default, :test)
+require 'test-unit'
+require 'activerecord-jdbc-adapter'
 
 class Test::Unit::TestCase
   def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.5.1
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
@@ -24,6 +24,62 @@ dependencies:
         version: 1.3.5
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-as400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: Install this gem to use AS/400 with JRuby on Rails.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
@@ -40,6 +96,7 @@ files:
 - lib/arjdbc/as400/adapter.rb
 - lib/arjdbc/as400/connection_methods.rb
 - test/config.yml
+- test/test_adapter.rb
 - test/test_connection.rb
 - test/test_database_tasks.rb
 - test/test_helper.rb
@@ -63,12 +120,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.1.9
+rubygems_version: 2.1.11
 signing_key:
 specification_version: 4
 summary: AS/400 JDBC adapter for JRuby on Rails.
 test_files:
 - test/config.yml
+- test/test_adapter.rb
 - test/test_connection.rb
 - test/test_database_tasks.rb
 - test/test_helper.rb