activerecord-jdbcteradata-adapter 0.3.4 → 0.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-jdbcteradata-adapter (0.3.3)
+    activerecord-jdbcteradata-adapter (0.3.4)
       activerecord
       activerecord-jdbc-adapter
       jdbc-teradata

data/activerecord-jdbcteradata-adapter.gemspec

@@ -1,19 +1,36 @@
 Gem::Specification.new do |s|
   s.name        = "activerecord-jdbcteradata-adapter"
-  s.version     = "0.3.4"
+  s.version     = "0.3.6"
   s.authors     = ["Chris Parker"]
   s.email       = [ "mrcsparker@gmail.com"]
   s.homepage    = "https://github.com/mrcsparker/activerecord-jdbcteradata-adapter"
   s.summary     = %q{Teradata JDBC driver for JRuby on Rails.}
   s.description = %q{Install this gem and require 'teradata' with JRuby on Rails.}
-
+  
   s.rubyforge_project = "activerecord-jdbcteradata-adapter"
+  
+  s.files = %w[
+    Gemfile
+    Gemfile.lock
+    LICENSE.txt
+    README.md
+    activerecord-jdbcteradata-adapter.gemspec
+    lib/active_record/connection_adapters/jdbcteradata_adapter.rb
+    lib/active_record/connection_adapters/teradata_adapter.rb
+    lib/activerecord-jdbcteradata-adapter.rb
+    lib/arel/engines/sql/compilers/teradata_compiler.rb
+    lib/arel/visitors/teradata.rb
+    lib/arjdbc/discover.rb
+    lib/arjdbc/teradata/adapter.rb
+    lib/arjdbc/teradata/connection_methods.rb
+    lib/arjdbc/teradata/teradata_java.jar
+    lib/arjdbc/teradata.rb
+  ]
 
-  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
+  
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_dependency 'activerecord-jdbc-adapter'

data/lib/arjdbc/teradata/adapter.rb

@@ -10,6 +10,9 @@ module ::ArJdbc
     ## ActiveRecord::ConnectionAdapters::JdbcAdapter
 
     #- jdbc_connection_class
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::TeradataJdbcConnection
+    end
 
     #- jdbc_column_class
 
@@ -41,8 +44,7 @@ module ::ArJdbc
     
     #+ self.arel2_visitors
     def self.arel2_visitors(config)
-      require 'arel/visitors/teradata'
-      {}.tap {|v| %w(teradata jdbcteradata).each {|x| v[x] = ::Arel::Visitors::Teradata } }
+      { 'teradata' => Arel::Visitors::Teradata, 'jdbcteradata' => Arel::Visitors::Teradata }
     end
 
     #- configure_arel2_visitors
@@ -124,26 +126,60 @@ module ::ArJdbc
 
     #- insert_sql
 
+    #= extract_schema_and_table (extra, taken from postgresql adapter)
+    # Extracts the table and schema name from +name+
+    def extract_schema_and_table(name)
+      schema, table = name.split('.', 2)
+
+      unless table # A table was provided without a schema
+        table  = schema
+        schema = nil
+      end
+
+      if name =~ /^"/ # Handle quoted table names
+        table  = name
+        schema = nil
+      end
+      [schema, table]
+    end
+
     #- tables
     def tables
-      @connection.tables(nil, database_name, nil, %w(TABLE))
+      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.tables(nil, schema, nil, %w(TABLE))
     end
 
     #- table_exists?
     def table_exists?(table_name)
       return false unless table_name
-      output = execute("SELECT count(*) as table_count FROM dbc.tables WHERE TableName = '#{table_name}' AND DatabaseName = '#{database_name}'")
-      output.first['table_count'] > 0
+      schema, table = extract_schema_and_table(table_name.to_s)
+      return false unless table
+
+      schema = database_name unless schema
+
+      output = execute("SELECT count(*) as table_count FROM dbc.tables WHERE TableName = '#{table}' AND DatabaseName = '#{schema}'")
+      output.first['table_count'].to_i > 0
     end
 
     #+ indexes
     # TODO: Multiple indexes per column
     IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition # :nodoc:
     def indexes(table_name, name = nil, schema_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
+
       result = select_rows('SELECT' <<
                                ' DatabaseName, TableName, ColumnName, IndexType, IndexName, UniqueFlag' <<
                                ' FROM DBC.Indices' <<
-                           " WHERE TableName = '#{table_name}' AND DatabaseName = '#{database_name}'")
+                           " WHERE TableName = '#{table}' AND DatabaseName = '#{schema}'")
     
       result.map do |row|
         idx_database_name = row[0].to_s.strip
@@ -188,7 +224,13 @@ module ::ArJdbc
     
     #- columns
     def columns(table_name, name = nil)
-      @connection.columns_internal(table_name.to_s, nil, database_name)
+      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
 
     #- column_exists?
@@ -326,3 +368,63 @@ module ::ArJdbc
 
   end
 end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class TeradataColumn < JdbcColumn
+      include ::ArJdbc::Teradata::Column
+
+      def initialize(name, *args)
+        if Hash === name
+          super
+        else
+          super(nil, name, *args)
+        end
+      end
+
+      def call_discovered_column_callbacks(*)
+      end
+    end
+
+    class TeradataAdapter < JdbcAdapter
+      include ::ArJdbc::Teradata
+
+      def initialize(*args)
+        super
+      end
+
+      def jdbc_connection_class(spec)
+        ::ArJdbc::Teradata.jdbc_connection_class
+      end
+
+      def jdbc_column_class
+        TeradataColumn
+      end
+      alias_chained_method :columns, :query_cache, :jdbc_columns
+
+      # some QUOTING caching :
+
+      @@quoted_table_names = {}
+
+      def quote_table_name(name)
+        unless quoted = @@quoted_table_names[name]
+          quoted = super
+          @@quoted_table_names[name] = quoted.freeze
+        end
+        quoted
+      end
+
+      @@quoted_column_names = {}
+
+      def quote_column_name(name)
+        unless quoted = @@quoted_column_names[name]
+          quoted = super
+          @@quoted_column_names[name] = quoted.freeze
+        end
+        quoted
+      end
+    end
+ 
+  end
+end
+

data/lib/arjdbc/teradata/connection_methods.rb

@@ -10,8 +10,10 @@ class ActiveRecord::Base
       config[:username] ||= Java::JavaLang::System.get_property('user.name')
       config[:host] ||= 'localhost'
       config[:port] ||= 1025
-      config[:url] ||= "jdbc:teradata://#{config[:host]}/DATABASE=#{config[:database]},DBS_PORT=#{config[:port]},COP=OFF"
+      config[:url] ||= "jdbc:teradata://#{config[:host]}/DATABASE=#{config[:database]},DBS_PORT=#{config[:port]},COP=OFF,tmode=ANSI,charset=UTF8"
       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

data/lib/arjdbc/teradata.rb

@@ -1,5 +1,9 @@
 require 'arjdbc'
 require 'arel/visitors/teradata'
-require 'arjdbc/teradata/adapter'
+
 require 'arjdbc/teradata/connection_methods'
+require 'arjdbc/teradata/adapter'
+
+# Load the java-specific parts
+require 'arjdbc/teradata/teradata_java'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcteradata-adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease:
 platform: ruby
 authors:
@@ -9,23 +9,21 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -33,17 +31,15 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -51,17 +47,15 @@ dependencies:
   name: activerecord-jdbc-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -69,17 +63,15 @@ dependencies:
   name: activerecord
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -87,17 +79,15 @@ dependencies:
   name: jdbc-teradata
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :runtime
@@ -108,23 +98,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - activerecord-jdbcteradata-adapter.gemspec
-- examples/models.rb
 - lib/active_record/connection_adapters/jdbcteradata_adapter.rb
 - lib/active_record/connection_adapters/teradata_adapter.rb
 - lib/activerecord-jdbcteradata-adapter.rb
 - lib/arel/engines/sql/compilers/teradata_compiler.rb
 - lib/arel/visitors/teradata.rb
 - lib/arjdbc/discover.rb
-- lib/arjdbc/teradata.rb
 - lib/arjdbc/teradata/adapter.rb
 - lib/arjdbc/teradata/connection_methods.rb
+- lib/arjdbc/teradata/teradata_java.jar
+- lib/arjdbc/teradata.rb
 - spec/active_record_schema_spec.rb
 - spec/adapter_spec.rb
 - spec/associations_spec.rb
@@ -143,17 +131,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: activerecord-jdbcteradata-adapter

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/

data/.rspec

@@ -1,3 +0,0 @@
---colour --profile
---format documentation
---format progress

data/examples/models.rb

@@ -1,76 +0,0 @@
-require 'rubygems'
-require 'active_record'
-
-CONFIG = {
-  :username => 'dbc',
-  :password => 'dbc',
-  :adapter => 'teradata',
-  :host => '192.168.5.130',
-  :database => 'DBC'
-}
-
-ActiveRecord::Base.establish_connection(CONFIG)
-
-class Acct < ActiveRecord::Base
-  self.table_name = 'financial.accts'
-  
-  belongs_to :customer, :foreign_key => 'cust_id'
-end
-
-class CheckingAcct < ActiveRecord::Base
-  self.table_name = 'financial.checking_acct'
-  self.primary_key = 'cust_id'
-
-  belongs_to :customer, :foreign_key => 'cust_id'
-end
-
-class CheckingTran < ActiveRecord::Base
-  self.table_name = 'financial.checking_tran'
-  self.primary_key = 'Tran_Id'
-
-  belongs_to :customer, :foreign_key => 'Cust_Id'
-end
-
-class CreditAcct < ActiveRecord::Base
-  self.table_name = 'financial.credit_acct'
-  self.primary_key = 'cust_id'
-
-  belongs_to :customer, :foreign_key => 'cust_id'
-end
-
-class CreditTran < ActiveRecord::Base
-  self.table_name ='financial.credit_tran'
-  self.primary_key = 'Tran_Id'
-
-  belongs_to :customer, :foreign_key => 'Cust_Id'
-end
-
-class Customer < ActiveRecord::Base
-  self.table_name = 'financial.customer'
-  self.primary_key = 'cust_id'
-end
-
-class CustomerName < ActiveRecord::Base
-  self.table_name = 'financial.customer_name'
-  self.primary_key = 'cust_id'
-
-  belongs_to :customer, :foreign_key => 'cust_id'
-end
-
-class SavingsAcct < ActiveRecord::Base
-  self.table_name = 'financial.savings_acct'
-  self.primary_key = 'cust_id'
-
-  belongs_to :customer, :foreign_key => 'cust_id'
-end
-
-class SavingsTran < ActiveRecord::Base
-  self.table_name = 'financial.savings_tran'
-  self.primary_key = 'Tran_Id'
-
-  belongs_to :customer, :foreign_key => 'Cust_Id'
-end
-
-class Tran < ActiveRecord::Base
-  self.table_name = 'financial.trans'
-end