activerecord-jdbcteradata-adapter 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-jdbcteradata-adapter (0.2.0)
+    activerecord-jdbcteradata-adapter (0.3.1)
       activerecord
       activerecord-jdbc-adapter
       jdbc-teradata
@@ -23,11 +23,11 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.2)
     i18n (0.6.1)
     jdbc-teradata (0.2.0)
     multi_json (1.7.2)
-    rake (10.0.3)
+    rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -40,6 +40,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord-jdbcteradata-adapter!

data/README.md

@@ -5,4 +5,7 @@
 ## DESCRIPTION:
 
 This is an ActiveRecord driver for Teradata using JDBC running under JRuby.
+
 It is still under heavy development.
+
+Right now I am testing this code with the ActiveRecord test suite.

data/activerecord-jdbcteradata-adapter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "activerecord-jdbcteradata-adapter"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["Chris Parker"]
   s.email       = [ "mrcsparker@gmail.com"]
   s.homepage    = "https://github.com/mrcsparker/activerecord-jdbcteradata-adapter"

data/lib/arel/visitors/teradata.rb

@@ -25,7 +25,6 @@ module Arel
         else
           sql = super
         end
-
         sql
       end
 
@@ -53,9 +52,9 @@ module Arel
         primary_key = @connection.columns(table_name).detect { |column| column.primary }
         return primary_key.name if primary_key
         # Look for an id column.  Return it, without changing case, to cover dbs with a case-sensitive collation.
-        columns(table_name).each { |column| return column.name if column.name =~ /^id$/i }
+        @connection.columns(table_name).each { |column| return column.name if column.name =~ /^id$/i }
         # Give up and provide something which is going to crash almost certainly
-        columns(table_name)[0].name
+        @connection.columns(table_name)[0].name
       end
 
       def add_limit_offset!(sql, options)

data/lib/arjdbc/teradata/adapter.rb

@@ -7,6 +7,8 @@ module ::ArJdbc
       [ /teradata/i, lambda { |cfg, column| column.extend(::ArJdbc::Teradata::Column) } ]
     end
     
+    ## ActiveRecord::ConnectionAdapters::JdbcAdapter
+
     #- jdbc_connection_class
 
     #- jdbc_column_class
@@ -16,6 +18,19 @@ module ::ArJdbc
     #- adapter_spec
 
     #+ modify_types
+    def modify_types(types)
+      super(types)
+      types[:primary_key] = 'INTEGER PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1 MINVALUE -2147483647 MAXVALUE 1000000000 NO CYCLE)',
+      types[:string][:limit] = 255
+      types[:integer][:limit] = nil
+      types
+    end
+
+    # Make sure that integer gets specified as INTEGER and not INTEGER(11)
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+      limit = nil if type.to_sym == :integer
+      super(type, limit, precision, scale)
+    end
 
     #+ adapter_name
     def adapter_name
@@ -41,7 +56,6 @@ module ::ArJdbc
 
     #+ native_database_types
     def native_database_types
-
       super.merge({
         :primary_key => 'INTEGER PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1 MINVALUE -2147483647 MAXVALUE 1000000000 NO CYCLE)',
         :string => { :name => 'VARCHAR', :limit => 255 },
@@ -50,15 +64,18 @@ module ::ArJdbc
         :decimal => { :name => "DECIMAL" },
         :datetime => { :name => "TIMESTAMP" },
         :timestamp => { :name => "TIMESTAMP" },
-        :time => { :name => "TIME" },
+        :time => { :name => "TIMESTAMP" },
         :date => { :name => "DATE" },
         :binary => { :name => "BLOB" },
-        :boolean => { :name => "BYTEINT", :limit => 1 },
+        :boolean => { :name => "BYTEINT" },
         :raw => { :name => "BYTE" }
       })
     end
 
     #- database_name
+    def database_name
+      @connection.config[:database]
+    end
 
     #- native_sql_to_type
 
@@ -96,12 +113,12 @@ module ::ArJdbc
       output = nil
       pk = primary_key(table)
       if pk
-        output = execute("SELECT TOP 1 #{pk} FROM #{table} ORDER BY #{pk} DESC").first[pk]
+        output = execute("SELECT TOP 1 #{quote_column_name(pk)} FROM #{quote_table_name(table)} ORDER BY #{quote_column_name(pk)} DESC").first[pk]
       end
       output
     end
 
-    #- select 
+    #- select
 
     #- select_rows
 
@@ -110,6 +127,11 @@ module ::ArJdbc
     #- tables
 
     #- 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
+    end
 
     #+ indexes
     # TODO: Multiple indexes per column
@@ -118,7 +140,7 @@ module ::ArJdbc
       result = select_rows("SELECT" <<
                            " DatabaseName, TableName, ColumnName, IndexType, IndexName, UniqueFlag" <<
                            " FROM DBC.Indices" <<
-                           " WHERE TableName = '#{table_name}'")
+                           " WHERE TableName = '#{table_name}' AND DatabaseName = '#{database_name}'")
     
       result.map do |row|
         idx_database_name = row[0].to_s.strip
@@ -155,24 +177,142 @@ module ::ArJdbc
 
     #- to_sql
 
+    ## ConnectionAdapters::Abstract::SchemaStatements
+
+    #- table_exists?
+
+    #- index_exists?
+    
+    #- columns
+
+    #- column_exists?
+
+    #- create_table
+
+    #- change_table
+    
+    #+ rename_table
+
+    #- drop_table
+    
+    #- add_column
+
+    #- remove_column
+    def remove_column(table_name, *column_names) #:nodoc:
+      for column_name in column_names.flatten
+        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
+      end
+    end
+
+    #+ change_column
+    # This only works in a VERY limited fashion.  For example, VARCHAR columns
+    # cannot be shortened, one column type cannot be converted to another.
+    def change_column(table_name, column_name, type, options = {}) #:nodoc:
+      change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} " <<
+        "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit])}"
+      add_column_options!(change_column_sql, options)
+      execute(change_column_sql)
+    end
+
+    #+ change_column_default
+    def change_column_default(table_name, column_name, default) #:nodoc:
+      execute "ALTER TABLE #{quote_table_name(table_name)} " + 
+        "ADD #{quote_column_name(column_name)} DEFAULT #{quote(default)}"
+    end
+
+    #+ rename_column
+    def rename_column(table_name, column_name, new_column_name) #:nodoc:
+      execute "ALTER TABLE #{quote_table_name(table_name)} " <<
+        "RENAME COLUMN #{quote_column_name(column_name)} to #{quote_column_name(new_column_name)}"
+    end
+
+    #- add_index
+
+    #- remove_index
+
+    #- rename_index
+
+    #- index_name
+
+    #- index_name_exists?
+
+    #+ structure_dump
+
+    #- dump_schema_information
+
+    #- initialize_schema_migrations_table
+
+    #- assume_migrated_upto_version
+
+    #- type_to_sql
+    
+    #- add_column_options!
+
+    #- distinct
+
+    #- add_timestamps
+
+    #- remove_timestamps
+
     module Column
       # Maps Teradata types of logical Rails types
       def simplified_type(field_type)
         case field_type
         when /^timestamp with(?:out)? time zone$/ then :datetime
+        when /byteint/i then :boolean
         else
           super
         end
       end
     end # column
 
+    def type_cast
+      return super unless value == true || value == false
+
+      value ? 1 : 0
+    end
+
+    def quote(value, column = nil)
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      case value
+      when String
+        %Q{'#{quote_string(value)}'}
+      when TrueClass
+        '1'
+      when FalseClass
+        '0'
+      else super
+      end
+    end
+
     def quote_column_name(name)
       %Q("#{name}")
     end
 
     def quote_table_name(name)
-      name.to_s
+      %Q("#{name.to_s}")
+    end
+
+    def quote_true
+      '1'
     end
 
+    def quoted_false
+      '0'
+    end
+
+    def add_index(table_name, column_name, options = {})
+      index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
+      execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} (#{index_columns}) ON #{quote_table_name(table_name)}"
+    end
+    
+    IDENTIFIER_LENGTH = 30 # :nodoc:
+    
+    # maximum length of Teradata identifiers is 30
+    def table_alias_length; IDENTIFIER_LENGTH; end # :nodoc:
+    def table_name_length;  IDENTIFIER_LENGTH; end # :nodoc:
+    def index_name_length;  IDENTIFIER_LENGTH; end # :nodoc:
+    def column_name_length; IDENTIFIER_LENGTH; end # :nodoc:
+
   end
 end

data/spec/active_record_schema_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+require 'models/active_record_schema'
+
+require 'models/active_record_models'
+
+describe 'ActiveRecordSchemaSpec' do
+
+  it 'should load in the activerecord sample schema.rb file' do
+    expect {
+      CreateActiveRecordSchema.up
+    }.to_not raise_error
+  end
+
+  context 'from loaded activerecord data' do
+    before(:all) do
+      CreateActiveRecordSchema.up
+      Topic.delete_all
+
+      1.upto(4) do |i|
+        @topic = Topic.new
+        @topic.title = "foo#{i}"
+        @topic.author_name = "author#{i}"
+        @topic.author_email_address = "email#{i}@localhost"
+        @topic.approved = true
+        @topic.save
+      end
+    end
+
+    it 'should be able to group data' do
+      topic = Topic.last
+      topic.approved = false
+      topic.save
+      approved_topics_count = Topic.group(:approved).count(:author_name)[true]
+      approved_topics_count.should == 3
+    end
+  end
+end

data/spec/adapter_spec.rb

@@ -19,6 +19,10 @@ describe 'Adapter' do
   it '#native_database_types' do
     @adapter.native_database_types.count.should > 0
   end
+  
+  it '#database_name' do
+    @adapter.database_name.should == 'weblog_development'
+  end
 
   it '#active?' do
     @adapter.active?.should be_true

data/spec/associations_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require 'models/purchase_orders'
+
+describe 'AssociationsSpec' do
+  before(:all) do
+    CreateVendors.up
+    CreateProducts.up
+    CreatePurchaseOrders.up
+  end
+
+  it 'should create all of the tables' do
+    vendor = Vendor.new(:name => 'Test vendor', :catch_phrase => 'Hello, world')
+    vendor.products.build(:name => 'Test product', :price => 100.00)
+    vendor.save
+
+    vendor.products.count.should == 1
+
+    purchase_order = PurchaseOrder.new
+    purchase_order.product = vendor.products.first
+
+    purchase_order.code = "ORDER1"
+    purchase_order.quantity = 2
+    purchase_order.save
+
+    vendor.purchase_orders.count.should == 1
+  end
+
+  after(:all) do
+    CreateVendors.down
+    CreateProducts.down
+    CreatePurchaseOrders.down
+  end
+end

data/spec/models/active_record_models.rb

@@ -0,0 +1,3 @@
+class Topic < ActiveRecord::Base
+  self.table_name = 'ar_topics'
+end