activerecord-jdbcteradata-adapter 0.2.0 → 0.3.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.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/activerecord-jdbcteradata-adapter.gemspec

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

data/examples/models.rb

@@ -12,61 +12,65 @@ CONFIG = {
 ActiveRecord::Base.establish_connection(CONFIG)
 
 class Acct < ActiveRecord::Base
-  def self.table_name
-    'financial.accts'
-  end
+  self.table_name = 'financial.accts'
+  
+  belongs_to :customer, :foreign_key => 'cust_id'
 end
 
 class CheckingAcct < ActiveRecord::Base
-  def self.table_name
-    'financial.checking_acct'
-  end
+  self.table_name = 'financial.checking_acct'
+  self.primary_key = 'cust_id'
+
+  belongs_to :customer, :foreign_key => 'cust_id'
 end
 
 class CheckingTran < ActiveRecord::Base
-  def self.table_name
-    'financial.checking_tran'
-  end
+  self.table_name = 'financial.checking_tran'
+  self.primary_key = 'Tran_Id'
+
+  belongs_to :customer, :foreign_key => 'Cust_Id'
 end
 
 class CreditAcct < ActiveRecord::Base
-  def self.table_name
-    'financial.credit_acct'
-  end
+  self.table_name = 'financial.credit_acct'
+  self.primary_key = 'cust_id'
+
+  belongs_to :customer, :foreign_key => 'cust_id'
 end
 
 class CreditTran < ActiveRecord::Base
-  def self.table_name
-    'financial.credit_tran'
-  end
+  self.table_name ='financial.credit_tran'
+  self.primary_key = 'Tran_Id'
+
+  belongs_to :customer, :foreign_key => 'Cust_Id'
 end
 
 class Customer < ActiveRecord::Base
-  def self.table_name
-    'financial.customer'
-  end
+  self.table_name = 'financial.customer'
+  self.primary_key = 'cust_id'
 end
 
 class CustomerName < ActiveRecord::Base
-  def self.table_name
-    'financial.customer_name'
-  end
+  self.table_name = 'financial.customer_name'
+  self.primary_key = 'cust_id'
+
+  belongs_to :customer, :foreign_key => 'cust_id'
 end
 
 class SavingsAcct < ActiveRecord::Base
-  def self.table_name
-    'financial.savings_acct'
-  end
+  self.table_name = 'financial.savings_acct'
+  self.primary_key = 'cust_id'
+
+  belongs_to :customer, :foreign_key => 'cust_id'
 end
 
 class SavingsTran < ActiveRecord::Base
-  def self.table_name
-    'financial.savings_tran'
-  end
+  self.table_name = 'financial.savings_tran'
+  self.primary_key = 'Tran_Id'
+
+  belongs_to :customer, :foreign_key => 'Cust_Id'
 end
 
 class Tran < ActiveRecord::Base
-  def self.table_name
-    'financial.trans'
-  end
+  self.table_name = 'financial.trans'
 end

data/lib/arel/visitors/teradata.rb

@@ -2,47 +2,6 @@ module Arel
   module Visitors
     class Teradata < Arel::Visitors::ToSql
 
-    def add_limit_offset!(sql, options)
-      if options[:limit]
-        order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
-        sql.sub!(/ ORDER BY.*$/i, '')
-        replace_limit_offset!(sql, options[:limit], options[:offset], order)
-      end
-    end
-
-    def replace_limit_offset!(sql, limit, offset, order)
-      if limit
-        offset ||= 0
-        start_row = offset + 1
-        end_row = offset + limit.to_i
-        find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
-        whole, select, rest_of_query = find_select.match(sql).to_a
-        rest_of_query.strip!
-        if rest_of_query[0...1] == "1" && rest_of_query !~ /1 AS/i
-          rest_of_query[0] = "*"
-        end
-        if rest_of_query[0] == "*"
-          from_table = get_table_name(rest_of_query)
-          rest_of_query = from_table + '.' + rest_of_query
-        end
-        new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query}"
-        new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
-        sql.replace(new_sql)
-      end
-      sql
-    end
-
-
-      def limit_for(limit_or_node)
-        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
-      end
-
-      def select_count? o
-        sel = o.cores.length == 1 && o.cores.first
-        projections = sel && sel.projections.length == 1 && sel.projections
-        projections && Arel::Nodes::Count === projections.first
-      end
-
       def visit_Arel_Nodes_SelectStatement o
         if !o.limit && o.offset
           raise ActiveRecord::ActiveRecordError, "You must specify :limit with :offset."
@@ -60,7 +19,7 @@ module Arel
             sql = o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join
           end
 
-          order ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
+          order ||= "ORDER BY #{determine_order_clause(sql)}"
           replace_limit_offset!(sql, limit_for(o.limit).to_i, o.offset && o.offset.value.to_i, order)
           sql = "SELECT COUNT(*) AS count_id FROM (#{sql}) AS subquery" if subquery
         else
@@ -69,6 +28,78 @@ module Arel
 
         sql
       end
+
+      # <Helpers>
+      # Lots of this code was pulled from the activerecord JDBC MSSQL driver
+
+      def get_table_name(sql)
+        if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
+          $1
+        elsif sql =~ /\bfrom\s+([^\(\s,]+)\s*/i
+          $1
+        else
+          nil
+        end
+      end
+
+      def determine_order_clause(sql)
+        return $1 if sql =~ /ORDER BY (.*)$/
+        table_name = get_table_name(sql)
+        "#{table_name}.#{determine_primary_key(table_name)}"
+      end
+
+      def determine_primary_key(table_name)
+        table_name = table_name.gsub('"', '')
+        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 }
+        # Give up and provide something which is going to crash almost certainly
+        columns(table_name)[0].name
+      end
+
+      def add_limit_offset!(sql, options)
+        if options[:limit]
+          order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
+          sql.sub!(/ ORDER BY.*$/i, '')
+          replace_limit_offset!(sql, options[:limit], options[:offset], order)
+        end
+      end
+
+      def replace_limit_offset!(sql, limit, offset, order)
+        if limit
+          offset ||= 0
+          start_row = offset + 1
+          end_row = offset + limit.to_i
+          find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
+          whole, select, rest_of_query = find_select.match(sql).to_a
+          rest_of_query.strip!
+          if rest_of_query[0...1] == "1" && rest_of_query !~ /1 AS/i
+            rest_of_query[0] = "*"
+          end
+          if rest_of_query[0] == "*"
+            from_table = get_table_name(rest_of_query)
+            rest_of_query = from_table + '.' + rest_of_query
+          end
+          new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query}"
+          new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
+          sql.replace(new_sql)
+        end
+        sql
+      end
+
+      def limit_for(limit_or_node)
+        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
+      end
+
+      def select_count? o
+        sel = o.cores.length == 1 && o.cores.first
+        projections = sel && sel.projections.length == 1 && sel.projections
+        projections && Arel::Nodes::Count === projections.first
+      end
+
+      # </Helpers>
+
     end
   end
 end

data/lib/arjdbc/teradata/adapter.rb

@@ -41,8 +41,9 @@ module ::ArJdbc
 
     #+ native_database_types
     def native_database_types
+
       super.merge({
-        :primary_key => 'INTEGER PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY',
+        :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 },
         :integer => { :name => "INTEGER" },
         :float => { :name => "FLOAT" },
@@ -80,6 +81,25 @@ module ::ArJdbc
     #+ do_exec
 
     #- execute
+    def _execute(sql, name = nil)
+      result = super
+      self.class.insert?(sql) ? last_insert_id(_table_name_from_insert(sql)) : result
+    end
+    private :_execute
+
+    def _table_name_from_insert(sql)
+      sql.split(" ", 4)[2].gsub('"', '').gsub("'", "")
+    end
+    private :_table_name_from_insert
+
+    def last_insert_id(table)
+      output = nil
+      pk = primary_key(table)
+      if pk
+        output = execute("SELECT TOP 1 #{pk} FROM #{table} ORDER BY #{pk} DESC").first[pk]
+      end
+      output
+    end
 
     #- select 
 
@@ -154,65 +174,5 @@ module ::ArJdbc
       name.to_s
     end
 
-    # <Helpers>
-
-    def get_table_name(sql)
-      if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
-        $1
-      elsif sql =~ /\bfrom\s+([^\(\s,]+)\s*/i
-        $1
-      else
-        nil
-      end
-    end
-
-    def determine_order_clause(sql)
-      return $1 if sql =~ /ORDER BY (.*)$/
-      table_name = get_table_name(sql)
-      "#{table_name}.#{determine_primary_key(table_name)}"
-    end
-
-    def determine_primary_key(table_name)
-      table_name = table_name.gsub('"', '')
-      primary_key = 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 }
-      # Give up and provide something which is going to crash almost certainly
-      columns(table_name)[0].name
-    end
-
-    def add_limit_offset!(sql, options)
-      if options[:limit]
-        order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
-        sql.sub!(/ ORDER BY.*$/i, '')
-        replace_limit_offset!(sql, options[:limit], options[:offset], order)
-      end
-    end
-
-    def replace_limit_offset!(sql, limit, offset, order)
-      if limit
-        offset ||= 0
-        start_row = offset + 1
-        end_row = offset + limit.to_i
-        find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
-        whole, select, rest_of_query = find_select.match(sql).to_a
-        rest_of_query.strip!
-        if rest_of_query[0...1] == "1" && rest_of_query !~ /1 AS/i
-          rest_of_query[0] = "*"
-        end
-        if rest_of_query[0] == "*"
-          from_table = get_table_name(rest_of_query)
-          rest_of_query = from_table + '.' + rest_of_query
-        end
-        new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query}"
-        new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
-        sql.replace(new_sql)
-      end
-      sql
-    end
-
-    # </Helpers>
-
   end
 end

data/spec/adapter_spec.rb

@@ -24,6 +24,26 @@ describe 'Adapter' do
     @adapter.active?.should be_true
   end
 
+  it '#exec_query' do
+    article_1 = Article.create(:title => 'exec_query_1', :body => 'exec_query_1')
+    article_2 = Article.create(:title => 'exec_query_2', :body => 'exec_query_2')
+    articles = @adapter.exec_query('select * from articles')
+    
+    articles.select { |i| i['title'] == article_1.title }.first.should_not be_nil
+    articles.select { |i| i['title'] == article_2.title }.first.should_not be_nil
+  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'))
+
+    article_2 = Article.create(:title => 'exec_query_2', :body => 'exec_query_2')
+    
+    article_1.id.should_not eq(article_2.id)
+
+    article_2.id.should eq(@adapter.last_insert_id('articles'))
+  end
+
   it '#tables' do
     @adapter.tables.should include('articles')
   end

data/spec/simple_spec.rb

@@ -37,13 +37,32 @@ describe 'SimpleSpec' do
     end
 
     it 'should be able to find(:where) an item' do
+      article = Article.create(:title => 'where', :body => 'where')
+      article = Article.where(:title => 'where').first
+      article.title.should eq('where')
+    end
+
+    it 'should be able to #reload and item' do
       article = Article.create(:title => 'reload', :body => 'reload')
-      article = Article.where(:title => 'reload').first
+      article.reload
       article.title.should eq('reload')
     end
 
-    it 'should be able to #reload and item' do
+    it 'should populate distinct ids for the primary key field after reload' do
+      article_1 = Article.create(:title => 'pk1_item_reload', :body => 'pk1_item_reload')
+      article_2 = Article.create(:title => 'pk2_item_reload', :body => 'pk2_item_reload')
+      
+      article_1.reload
+      article_2.reload
+
+      article_1.id.should_not eq(article_2.id)
+    end
+
+    it 'should populate distinct ids for the primary key field' do
+      article_1 = Article.create(:title => 'pk1_item', :body => 'pk1_item')
+      article_2 = Article.create(:title => 'pk2_item', :body => 'pk2_item')
       
+      article_1.id.should_not eq(article_2.id)
     end
 
     after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcteradata-adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - Gemfile
 - Gemfile.lock