active_table 0.1.3 → 0.1.4

data/lib/active_table/base.rb

@@ -56,22 +56,33 @@ module ActiveTable
 
         unless connection.table_exists?(temp_table_name)
           db_drop_and_create_table(temp_table_name, @table[:options], @table[:block])
+          insert_rows!(@table[:name], :temporary => true)
+
+          case [tables_match?(@table[:name], temp_table_name), rows_match?(@table[:name], temp_table_name)]
+            when [false, false], [false, true]
+              db_drop_table(@table[:name])
+              connection.rename_table(temp_table_name, @table[:name])
+            when [true, false]
+              db_truncate_and_copy_tables(@table[:name], temp_table_name)
+            when [true, true]
+              db_drop_table(temp_table_name)
+          end
+        end
+      end
 
-          unless tables_match?(@table[:name], temp_table_name)
-            db_drop_table(@table[:name])
-            connection.rename_table(temp_table_name, @table[:name])
-
-            @@insert_statements.reject!{|statement| statement[:table_name] == @table[:name]}
-            @@table_list << @table[:name] unless @@table_list.include?(@table[:name])
+      def insert_rows!(table_name, options = {})
+        @@insert_statements.reject!{|statement| statement[:table_name] == @table[:name]}
+        @@table_list << @table[:name] unless @@table_list.include?(@table[:name])
 
-            @table[:rows].each do |row|
-              insert_sql = generate_insert_sql_for_hash(connection, @table[:name], row)
-              connection.execute insert_sql
-              @@insert_statements << {:table_name => @table[:name], :sql => insert_sql}
-            end
+        @table[:rows].each do |row|
+          if options[:temporary]
+            insert_sql_now = generate_insert_sql_for_hash(connection, "#{table_name}__temp", row)
+            insert_sql_later = generate_insert_sql_for_hash(connection, table_name, row)
           else
-            db_drop_table(temp_table_name)
+            insert_sql_now = insert_sql_later = generate_insert_sql_for_hash(connection, table_name_name, row)
           end
+          @@insert_statements << {:table_name => @table[:name], :sql => insert_sql_later}
+          connection.execute insert_sql_now
         end
       end
 
@@ -82,6 +93,23 @@ module ActiveTable
         columns_1.to_json == columns_2.to_json
       end
 
+      def rows_match?(table_1, table_2)
+        return false unless connection.table_exists?(table_1) and connection.table_exists?(table_2)
+
+        query = "SELECT COUNT(*) AS rows FROM (SELECT DISTINCT * FROM ( SELECT * FROM #{connection.quote_table_name(table_1)} UNION ALL SELECT * FROM #{connection.quote_table_name(table_2)} ) t) s"
+        distinct_count = connection.execute(query).first["rows"]
+
+        query = "SELECT COUNT(*) AS rows FROM #{connection.quote_table_name(table_1)}"
+        current_count = connection.execute(query).first["rows"]
+
+        distinct_count == current_count
+      end
+
+      def db_truncate_and_copy_tables(destination, source)
+        connection.execute("DELETE FROM #{connection.quote_table_name(destination)}")
+        connection.execute("INSERT INTO #{connection.quote_table_name(destination)} SELECT * FROM #{connection.quote_table_name(source)}")
+      end
+
       def db_drop_and_create_table(name, options, block)
         db_drop_table(name)
         connection.create_table name, options do |t|

data/lib/active_table/version.rb

@@ -1,3 +1,3 @@
 module ActiveTable
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/active_table_spec.rb

@@ -94,6 +94,33 @@ describe "a model created with active_table" do
       lambda { @connection.execute("SELECT name FROM awesome_models") }.should raise_error
       lambda { @connection.execute("SELECT different_name FROM awesome_models") }.should_not raise_error
     end
+
+    it "should truncate and reload data if the data has changed" do
+      class AwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+
+          insert :id => 1, :name => "foo"
+          insert :id => 2, :name => "bar"
+        end
+      end
+
+      class MoreAwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+
+          insert :id => 1, :name => "baz"
+        end
+      end
+
+      @connection.execute("SELECT * FROM awesome_models").size.should == 1
+    end
   end
 
   context "#table_list" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_table
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165817320 !ruby/object:Gem::Requirement
+  requirement: &2161615920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,7 +24,7 @@ dependencies:
         version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165817320
+  version_requirements: *2161615920
 description: Dynamically-populated ActiveRecord models based on static data
 email:
 - casecommons-dev@googlegroups.com