activerecord-jdbcteradata-adapter 0.3.8 → 0.3.9

data/Gemfile.lock

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

data/activerecord-jdbcteradata-adapter.gemspec

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

data/lib/arjdbc/teradata/adapter.rb

@@ -101,10 +101,14 @@ module ::ArJdbc
 
     #- execute
     def _execute(sql, name = nil)
-      result = super
-      self.class.insert?(sql) ? last_insert_id(_table_name_from_insert(sql)) : result
+      if self.class.select?(sql)
+        @connection.execute_query(sql)
+      elsif self.class.insert?(sql)
+        (@connection.execute_insert(sql) or last_insert_id(sql)).to_i
+      else
+        @connection.execute_update(sql)
+      end
     end
-    private :_execute
 
     def _table_name_from_insert(sql)
       sql.split(' ', 4)[2].gsub('"', '').gsub("'", '')

data/spec/associations_spec.rb

@@ -8,6 +8,7 @@ describe 'AssociationsSpec' do
     CreateProducts.up
     CreatePurchaseOrders.up
     CreateOrderLineItems.up
+    CreateOrderFeelings.up
   end
 
   it 'should create all of the tables' do
@@ -28,7 +29,7 @@ describe 'AssociationsSpec' do
   end
 
   describe '#accepts_nested_attibutes_for' do
-    it 'should be able to create a purchase_order with line_items' do
+    it 'it has_many' do
       vendor = Vendor.new(:name => 'Test vendor', :catch_phrase => 'Hello, world')
       vendor.products.build(:name => 'Test product', :price => 100.00)
       vendor.save
@@ -45,6 +46,44 @@ describe 'AssociationsSpec' do
       purchase_order = PurchaseOrder.create(params[:purchase_order])
       purchase_order.order_line_items.size.should == 1
     end
+
+    it 'it has_one#create' do
+      vendor = Vendor.new(:name => 'Test vendor', :catch_phrase => 'Hello, world')
+      vendor.products.build(:name => 'Test product', :price => 100.00)
+      vendor.save
+
+      params = { :purchase_order => {
+        :product_id => vendor.products.first.id,
+        :code => 'Order 2',
+        :quantity => 1,
+        :order_feeling_attributes =>
+          { :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)
+      vendor.save
+
+      params = { :purchase_order => {
+        :product_id => vendor.products.first.id,
+        :code => 'Order 3',
+        :quantity => 1,
+        :order_feeling_attributes =>
+          { :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
@@ -52,5 +91,6 @@ describe 'AssociationsSpec' do
     CreateProducts.down
     CreatePurchaseOrders.down
     CreateOrderLineItems.down
+    CreateOrderFeelings.down
   end
 end

data/spec/models/purchase_orders.rb

@@ -44,6 +44,21 @@ class CreatePurchaseOrders < ActiveRecord::Migration
   end
 end
 
+class CreateOrderFeelings < ActiveRecord::Migration
+  def self.up
+    create_table :order_feelings do |t|
+      t.integer :purchase_order_id, :null => false
+      t.string :status, :null => false
+    end
+
+    add_index :order_feelings, :purchase_order_id, :name => 'idx_order_feelings_po_id'
+  end
+
+  def self.down
+    drop_table :order_feelings
+  end
+end
+
 class CreateOrderLineItems < ActiveRecord::Migration
   def self.up
     create_table :order_line_items do |t|
@@ -70,6 +85,10 @@ class Product < ActiveRecord::Base
   has_many :purchase_orders
 end
 
+class OrderFeeling < ActiveRecord::Base
+  belongs_to :purchase_order
+end
+
 class OrderLineItem < ActiveRecord::Base
   belongs_to :purchase_order
 end
@@ -78,5 +97,7 @@ class PurchaseOrder < ActiveRecord::Base
   belongs_to :product
   has_many :order_line_items, :dependent => :destroy
   accepts_nested_attributes_for :order_line_items, :allow_destroy => true
+  has_one :order_feeling, :dependent => :destroy
+  accepts_nested_attributes_for :order_feeling, :allow_destroy => true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcteradata-adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease:
 platform: ruby
 authors: