activerecord-jdbcteradata-adapter 0.4.2 → 0.5.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    activerecord-jdbcteradata-adapter (0.4.1)
-      activerecord
+    activerecord-jdbcteradata-adapter (0.4.2)
+      activerecord (<= 3.2.13)
       activerecord-jdbc-adapter
       jdbc-teradata
 
@@ -17,7 +17,7 @@ GEM
       activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.9)
+    activerecord-jdbc-adapter (1.2.9.1)
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
@@ -26,7 +26,7 @@ GEM
     diff-lcs (1.2.4)
     i18n (0.6.1)
     jdbc-teradata (0.3.0)
-    multi_json (1.7.4)
+    multi_json (1.7.7)
     rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)

data/activerecord-jdbcteradata-adapter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'activerecord-jdbcteradata-adapter'
-  s.version     = '0.4.2'
+  s.version     = '0.5.0'
   s.authors     = ['Chris Parker']
   s.email       = %w(mrcsparker@gmail.com)
   s.homepage    = 'https://github.com/mrcsparker/activerecord-jdbcteradata-adapter'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     lib/arjdbc/teradata/adapter.rb
     lib/arjdbc/teradata/connection_methods.rb
     lib/arjdbc/teradata/teradata_java.jar
+    lib/arjdbc/teradata/explain_support.rb
     lib/arjdbc/teradata.rb
   ]
 
@@ -34,6 +35,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_dependency 'activerecord-jdbc-adapter'
-  s.add_dependency 'activerecord'
+  s.add_dependency 'activerecord', '<= 3.2.13'
   s.add_dependency 'jdbc-teradata'
 end

data/lib/arel/visitors/teradata.rb

@@ -23,9 +23,9 @@ module Arel
   end
 
   class SelectManager < Arel::TreeManager
-    
+
     AR_CA_SQLSA_NAME = 'Teradata'.freeze
-    
+
     # Getting real Ordering objects is very important for us. We need to be able to call #uniq on
     # a colleciton of them reliably as well as using their true object attributes to mutate them
     # to grouping objects for the inner sql during a select statment with an offset/rownumber. So this
@@ -76,13 +76,13 @@ module Arel
         lock_without_teradata(locking)
       end
     end
-    
+
     private
-    
+
     def engine_activerecord_teradata_adapter?
       @engine.connection && @engine.connection.adapter_name == AR_CA_SQLSA_NAME
     end
-    
+
   end
 
   module Visitors
@@ -101,7 +101,7 @@ module Arel
           visit_Arel_Nodes_SelectStatementWithOutOffset(o)
         end
       end
-      
+
       def visit_Arel_Nodes_UpdateStatement(o)
         if o.orders.any? && o.limit.nil?
           o.limit = Nodes::Limit.new(214748364)
@@ -120,7 +120,7 @@ module Arel
       def visit_Arel_Nodes_Lock(o)
         visit o.expr
       end
-      
+
       def visit_Arel_Nodes_Ordering(o)
         if o.respond_to?(:direction)
           "#{visit o.expr} #{o.ascending? ? 'ASC' : 'DESC'}"
@@ -128,7 +128,7 @@ module Arel
           visit o.expr
         end
       end
-      
+
       def visit_Arel_Nodes_Bin(o)
         "#{visit o.expr} #{@connection.cs_equality_operator}"
       end
@@ -203,7 +203,6 @@ module Arel
         ].compact.join ' '
       end
 
-
       # Teradata Helpers
 
       def source_with_lock_for_select_statement(o)
@@ -248,18 +247,18 @@ module Arel
           ((p1.respond_to?(:distinct) && p1.distinct) ||
             p1.respond_to?(:include?) && p1.include?('DISTINCT'))
       end
-      
+
       def windowed_single_distinct_select_statement?(o)
         o.limit && o.offset && single_distinct_select_statement?(o)
       end
-      
+
       def single_distinct_select_everything_statement?(o)
         single_distinct_select_statement?(o) && visit(o.cores.first.projections.first).ends_with?('.*')
       end
-      
+
       def top_one_everything_for_through_join?(o)
-        single_distinct_select_everything_statement?(o) && 
-          (o.limit && !o.offset) && 
+        single_distinct_select_everything_statement?(o) &&
+          (o.limit && !o.offset) &&
           join_in_select_statement?(o)
       end
 
@@ -277,9 +276,9 @@ module Arel
 
       def eager_limiting_select_statement?(o)
         core = o.cores.first
-        single_distinct_select_statement?(o) && 
-          (o.limit && !o.offset) && 
-          core.groups.empty? && 
+        single_distinct_select_statement?(o) &&
+          (o.limit && !o.offset) &&
+          core.groups.empty? &&
           !single_distinct_select_everything_statement?(o)
       end
 
@@ -295,7 +294,7 @@ module Arel
           o.limit &&
           !join_in_select_statement?(o)
       end
-      
+
       def select_primary_key_sql?(o)
         core = o.cores.first
         return false if core.projections.size != 1

data/lib/arjdbc/teradata/adapter.rb

@@ -1,8 +1,32 @@
 require 'arjdbc/mssql/limit_helpers'
+require 'arjdbc/teradata/explain_support'
 
 module ::ArJdbc
   module Teradata
 
+    require 'arjdbc/jdbc/serialized_attributes_helper'
+    ActiveRecord::Base.class_eval do
+      def after_save_with_teradata_lob
+        lob_columns = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
+        lob_columns.each do |column|
+          value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
+          next if value.nil? # already set NULL
+          self.class.connection.write_large_object(
+            column.type == :binary, column.name,
+            self.class.table_name,
+            self.class.primary_key,
+            self.class.connection.quote(id), value
+          )
+        end
+      end
+    end
+
+    #Used to add after_save lob saving method to ActiveRecord when
+    #this adapter is used.
+    def self.included(base)
+      ActiveRecord::Base.after_save :after_save_with_teradata_lob
+    end
+
     def self.column_selector
       [ /teradata/i, lambda { |cfg, column| column.extend(::ArJdbc::Teradata::Column) } ]
     end
@@ -70,6 +94,7 @@ module ::ArJdbc
               :time => { :name => 'TIMESTAMP'},
               :date => { :name => 'DATE'},
               :binary => { :name => 'BLOB'},
+              :text => { :name => 'CLOB'},
               :boolean => { :name => 'BYTEINT'},
               :raw => { :name => 'BYTE'}
           }
@@ -89,8 +114,6 @@ module ::ArJdbc
 
     #- disconnect!
 
-    #- jdbc_columns
-
     #- exec_query
 
     #- exec_insert
@@ -136,9 +159,9 @@ module ::ArJdbc
 
     #- select
     def select(sql, *rest)
-    # TJC - Teradata does not like "= NULL", "!= NULL", or "<> NULL".
-    # TJC - Also does not like != so transforming that to <>
-       execute(sql.gsub(/(!=|<>)\s*null/i, "IS NOT NULL").gsub(/=\s*null/i, "IS NULL").gsub("!=","<>"), *rest)
+      # TJC - Teradata does not like "= NULL", "!= NULL", or "<> NULL".
+      # TJC - Also does not like != so transforming that to <>
+      execute(sql.gsub(/(!=|<>)\s*null/i, "IS NOT NULL").gsub(/=\s*null/i, "IS NULL").gsub("!=","<>"), *rest)
     end
 
     #- select_rows
@@ -175,7 +198,7 @@ module ::ArJdbc
 
       schema = database_name unless schema
 
-      output = execute("SELECT count(*) as table_count FROM dbc.tables WHERE TableName = '#{table}' AND DatabaseName = '#{schema}'")
+      output = execute("SELECT count(*) as table_count FROM dbc.tables WHERE TableName (NOT CS) = '#{table}' (NOT CS) AND DatabaseName (NOT CS) = '#{schema}' (NOT CS) ")
       output.first['table_count'].to_i > 0
     end
 
@@ -189,10 +212,10 @@ module ::ArJdbc
 
       schema = database_name unless schema
 
-      result = select_rows('SELECT' <<
-                           ' DatabaseName, TableName, ColumnName, IndexType, IndexName, UniqueFlag' <<
-                           ' FROM DBC.Indices' <<
-                           " WHERE TableName = '#{table}' AND DatabaseName = '#{schema}'")
+      result = select_rows("SELECT DatabaseName, TableName, ColumnName, IndexType, IndexName, UniqueFlag" <<
+                           " FROM DBC.Indices" <<
+                           " WHERE TableName (NOT CS) = '#{table}' (NOT CS)" <<
+                           " AND DatabaseName (NOT CS) = '#{schema}' (NOT CS)")
 
       result.map do |row|
         idx_table_name = row[1].to_s.strip
@@ -224,6 +247,15 @@ module ::ArJdbc
     #- primary_key
 
     #- primary_keys
+    def primary_keys(table)
+      if self.class.lowercase_schema_reflection
+        @connection.primary_keys(table).map do |key|
+          key.downcase
+        end
+      else
+        @connection.primary_keys(table)
+      end
+    end
 
     #- to_sql
 
@@ -238,9 +270,7 @@ module ::ArJdbc
       return false unless table_name
       schema, table = extract_schema_and_table(table_name.to_s)
       return false unless table
-
       schema = database_name unless schema
-
       @connection.columns_internal(table, nil, schema)
     end
 
@@ -319,6 +349,7 @@ module ::ArJdbc
         case field_type
           when /^timestamp with(?:out)? time zone$/ then :datetime
           when /byteint/i then :boolean
+          when /blob/i then :binary
           else
             super
         end
@@ -335,7 +366,17 @@ module ::ArJdbc
       return value.quoted_id if value.respond_to?(:quoted_id)
       case value
         when String
-          %Q{'#{quote_string(value)}'}
+          if String === value && column && (column.type == :binary || column.type == :text)
+            'NULL'
+          else
+            %Q{'#{quote_string(value)}'}
+          end
+        when Fixnum
+          if Fixnum === value && column and column.type == :string
+            %Q{'#{quote_string(value.to_s)}'}
+          else
+            super
+          end
         when TrueClass
           '1'
         when FalseClass
@@ -417,6 +458,15 @@ module ActiveRecord
       def jdbc_column_class
         TeradataColumn
       end
+
+      #- jdbc_columns
+      def jdbc_columns(table_name, name = nil)
+        return false unless table_name
+        schema, table = extract_schema_and_table(table_name.to_s)
+        return false unless table
+        schema = database_name unless schema
+        @connection.columns(table, nil, schema)
+      end
       alias_chained_method :columns, :query_cache, :jdbc_columns
 
       # some QUOTING caching :

data/lib/arjdbc/teradata/connection_methods.rb

@@ -7,18 +7,44 @@ class ActiveRecord::Base
       rescue LoadError # assuming driver.jar is on the class-path
       end
 
-      config[:username] ||= Java::JavaLang::System.get_property('user.name')
-      config[:host] ||= 'localhost'
-      config[:port] ||= 1025
-      config[:tmode] ||= 'ANSI' # ANSI, Teradata, DEFAULT
-      config[:charset] ||= 'UTF8'
-      config[:cop] ||= 'OFF'
-      config[:url] ||= "jdbc:teradata://#{config[:host]}/DATABASE=#{config[:database]},DBS_PORT=#{config[:port]},COP=#{config[:cop]},tmode=#{config[:tmode]},charset=#{config[:charset]}"
-      config[:driver] ||= 'com.teradata.jdbc.TeraDriver'
-      config[:adapter_class] = ActiveRecord::ConnectionAdapters::TeradataAdapter
-      config[:adapter_spec] = ::ArJdbc::Teradata
-      jdbc_connection(config)
+      if config[:jndi]
+        jndi = config[:jndi].to_s
+        ctx = javax.naming.InitialContext.new
+        ds = nil
+
+        # Taken from oracle-enhanced (https://github.com/rsim/oracle-enhanced)
+        # tomcat needs first lookup method, oc4j (and maybe other application servers) need second method
+        begin
+          env = ctx.lookup('java:/comp/env')
+          ds = env.lookup(jndi)
+        rescue
+          ds = ctx.lookup(jndi)
+        end
+
+        # For ARJDBC we only need the URL, username, and password
+        # We set the database config entry because it's used by the adapter to determine database_name
+        config[:url] = ds.getUrl
+        config[:username] ||= ds.getUsername
+        config[:database] ||= config[:url][/DATABASE=(.*?),/m, 1] unless config[:url].nil?
+        config[:password] ||= ds.getPassword
+
+      else
+        config[:username] ||= Java::JavaLang::System.get_property('user.name')
+        config[:host] ||= 'localhost'
+        config[:port] ||= 1025
+        config[:tmode] ||= 'ANSI' # ANSI, Teradata, DEFAULT
+        config[:charset] ||= 'UTF8'
+        config[:cop] ||= 'OFF'
+        config[:log_level] ||= 'ERROR'
+        config[:xviews] ||= 'OFF'
+        config[:url] ||= "jdbc:teradata://#{config[:host]}/DATABASE=#{config[:database]},DBS_PORT=#{config[:port]},COP=#{config[:cop]},tmode=#{config[:tmode]},charset=#{config[:charset]},LOG=#{config[:log_level]},USEXVIEWS=#{config[:xviews]}"
+      end
+        config[:driver] ||= 'com.teradata.jdbc.TeraDriver'
+        config[:adapter_class] = ActiveRecord::ConnectionAdapters::TeradataAdapter
+        config[:adapter_spec] = ::ArJdbc::Teradata
+        jdbc_connection(config)
     end
+
     alias_method :jdbcteradata_connection, :teradata_connection
   end
 end

data/lib/arjdbc/teradata/explain_support.rb

@@ -0,0 +1,15 @@
+module ::ArJdbc
+  module Teradata
+    def supports_explain?
+      true
+    end
+
+    def explain(arel, binds = [])
+      sql = "EXPLAIN #{to_sql(arel, binds)}"
+      raw_result  = @connection.execute_query(sql)
+      raw_result
+      rows = raw_result.map { |hash| hash.values }
+      rows.join("\n")
+    end
+  end
+end

data/spec/adapter_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 require 'models/simple_article'
 require 'models/lowercase_model'
+require 'models/model_with_blob'
 
 describe 'Adapter' do
 
@@ -40,6 +41,13 @@ describe 'Adapter' do
       articles.select { |i| i['title'] == article_2.title }.first.should_not be_nil
     end
 
+    it '#explain' do
+      article_1 = Article.create(:title => 'exec_query_1', :body => 'exec_query_1')
+      explain_plan = @adapter.explain('select * from articles')
+      explain_plan.should include('WEBLOG_DEVELOPMENT.articles')
+      explain_plan.should include('total estimated time')
+    end
+
     it '#last_insert_id(table)' do
       article_1 = Article.create(:title => 'exec_query_1', :body => 'exec_query_1')
       article_1.id.should eq(@adapter.last_insert_id('articles'))
@@ -135,4 +143,33 @@ describe 'Adapter' do
       CreateShirts.down
     end
   end
+
+  context 'testing BLOB support' do
+    before(:each) do
+      CreateTestFiles.up
+      @connection = TestFile.connection
+    end
+
+     it 'should be able to save a BLOB' do
+      file = TestFile.new
+      file.name = 'test'
+
+      path = File.join(File.dirname(__FILE__), '')
+
+      bytes = File.open(File.join(path, '/fixtures/wikimedia-commons-poty-2006.jpg'), 'rb')\
+                        .read\
+                        .to_java_bytes
+      file.data = bytes.to_s
+      file.save
+      TestFile.where(:name => 'test').count.should eq(1)
+      TestFile.where(:name => 'test').first.data.should eq(file.data)
+      #Uncomment this line to perform a visual test.
+      #The test.jpg image should be the same as the wikimedia commons jpg image.
+      #File.open(File.join(path, '/fixtures/test.jpg'), 'wb') { |file| file.write(TestFile.first.data.to_s) }
+    end
+
+    after(:each) do
+      CreateTestFiles.down
+    end
+  end
 end

data/spec/associations_spec.rb

@@ -13,6 +13,7 @@ describe 'AssociationsSpec' do
 
   it 'should create all of the tables' do
     vendor = Vendor.new(:name => 'Test vendor', :catch_phrase => 'Hello, world')
+    puts vendor.inspect
     vendor.products.build(:name => 'Test product', :price => 100.00)
     vendor.save
 
@@ -38,8 +39,8 @@ describe 'AssociationsSpec' do
         :product_id => vendor.products.first.id,
         :code => 'Order 2',
         :quantity => 1,
-        :order_line_items_attributes => [ 
-          { :item_name => 'Test item' } 
+        :order_line_items_attributes => [
+          { :item_name => 'Test item' }
         ]
       } }
 
@@ -57,14 +58,14 @@ describe 'AssociationsSpec' do
         :code => 'Order 2',
         :quantity => 1,
         :order_feeling_attributes =>
-          { :status => 'Wonderful' } 
-        
+          { :status => 'Wonderful' }
+
       } }
 
       purchase_order = PurchaseOrder.create(params[:purchase_order])
       purchase_order.order_feeling.status.should eq('Wonderful')
     end
- 
+
     it 'it has_one#new' do
       vendor = Vendor.new(:name => 'Test vendor', :catch_phrase => 'Hello, world')
       vendor.products.build(:name => 'Test product', :price => 100.00)
@@ -75,15 +76,15 @@ describe 'AssociationsSpec' do
         :code => 'Order 3',
         :quantity => 1,
         :order_feeling_attributes =>
-          { :status => 'Wonderful' } 
-        
+          { :status => 'Wonderful' }
+
       } }
 
       purchase_order = PurchaseOrder.new(params[:purchase_order])
       purchase_order.save
       purchase_order.order_feeling.status.should eq('Wonderful')
     end
- 
+
   end
 
   after(:all) do

data/spec/connection_spec.rb

@@ -1,8 +1,48 @@
 require 'spec_helper'
+require 'java'
+require 'commons-pool-1.6.jar'
+require 'commons-dbcp-1.4.jar'
 
 describe 'Connection' do
   it 'should create a connection' do
     ActiveRecord::Base.connection.execute('select * from dbc.tables')
     ActiveRecord::Base.connected?.should be_true
   end
+
+  it "should create a new connection using JNDI" do
+    begin
+      import 'org.apache.commons.pool.impl.GenericObjectPool'
+      import 'org.apache.commons.dbcp.BasicDataSource'
+      import 'org.apache.commons.dbcp.BasicDataSourceFactory'
+      import 'org.apache.commons.dbcp.DriverManagerConnectionFactory'
+    rescue NameError => e
+      return pending e.message
+    end
+
+    class InitialContextMock
+      def initialize
+        url = "jdbc:teradata://#{TERADATA_CONFIG[:host]}/DATABASE=#{TERADATA_CONFIG[:database]},DBS_PORT=#{TERADATA_CONFIG[:port]}"
+        @data_source = BasicDataSource.new()
+        @data_source.set_driver_class_name('com.teradata.jdbc.TeraDriver')
+        @data_source.set_url(url)
+        @data_source.set_username(TERADATA_CONFIG[:username])
+        @data_source.set_password(TERADATA_CONFIG[:password])
+
+        @data_source.access_to_underlying_connection_allowed = true
+      end
+      def lookup(path)
+        if (path == 'java:/comp/env')
+          return self
+        else
+          return @data_source
+        end
+      end
+    end
+
+    javax.naming.InitialContext.stub!(:new).and_return(InitialContextMock.new)
+
+    ActiveRecord::Base.establish_connection(TERADATA_JNDI_CONFIG)
+    ActiveRecord::Base.connection.execute('select * from dbc.tables')
+    ActiveRecord::Base.connected?.should be_true
+  end
 end

data/spec/models/model_with_blob.rb

@@ -0,0 +1,17 @@
+class CreateTestFiles < ActiveRecord::Migration
+  def self.up
+    create_table 'test_files' do |t|
+      t.string 'name', :null => false
+      t.binary 'data'
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table 'test_files'
+  end
+end
+
+class TestFile < ActiveRecord::Base
+  self.table_name = 'test_files'
+end

data/spec/spec_helper.rb

@@ -2,11 +2,19 @@ require 'active_record'
 
 TERADATA_CONFIG = {
   :adapter => 'teradata',
-  :host => '192.168.5.130',
+  :host => (ENV['TERADATA_HOST'] || 'localhost'),
   :database => 'weblog_development',
   :port => 1025,
   :username => 'dbc',
   :password => 'dbc'
 }
 
+TERADATA_JNDI_CONFIG = {
+  :adapter => 'teradata',
+  :jndi => 'jdbc/TeradataDS',
+  :username => 'dbc',
+  :password => 'dbc',
+  :pool => 20
+}
+
 ActiveRecord::Base.establish_connection(TERADATA_CONFIG)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcteradata-adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,15 +63,15 @@ dependencies:
   name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
     none: false
   prerelease: false
   type: :runtime
@@ -112,14 +112,19 @@ files:
 - lib/arjdbc/teradata/adapter.rb
 - lib/arjdbc/teradata/connection_methods.rb
 - lib/arjdbc/teradata/teradata_java.jar
+- lib/arjdbc/teradata/explain_support.rb
 - lib/arjdbc/teradata.rb
 - spec/active_record_schema_spec.rb
 - spec/adapter_spec.rb
 - spec/associations_spec.rb
+- spec/commons-dbcp-1.4.jar
+- spec/commons-pool-1.6.jar
 - spec/connection_spec.rb
+- spec/fixtures/wikimedia-commons-poty-2006.jpg
 - spec/models/active_record_models.rb
 - spec/models/active_record_schema.rb
 - spec/models/lowercase_model.rb
+- spec/models/model_with_blob.rb
 - spec/models/purchase_orders.rb
 - spec/models/simple_article.rb
 - spec/simple_spec.rb
@@ -152,10 +157,14 @@ test_files:
 - spec/active_record_schema_spec.rb
 - spec/adapter_spec.rb
 - spec/associations_spec.rb
+- spec/commons-dbcp-1.4.jar
+- spec/commons-pool-1.6.jar
 - spec/connection_spec.rb
+- spec/fixtures/wikimedia-commons-poty-2006.jpg
 - spec/models/active_record_models.rb
 - spec/models/active_record_schema.rb
 - spec/models/lowercase_model.rb
+- spec/models/model_with_blob.rb
 - spec/models/purchase_orders.rb
 - spec/models/simple_article.rb
 - spec/simple_spec.rb