offroad 0.0.1 → 0.0.2

data/Rakefile

@@ -68,7 +68,7 @@ gemspec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
 
-  s.add_dependency('ar-extensions')
+  s.add_dependency('ar-extensions', '0.9.4')
 end
 
 Rake::GemPackageTask.new(gemspec) do |pkg|

data/lib/app/models/offroad/received_record_state.rb

@@ -81,12 +81,18 @@ module Offroad
 
       return unless remaining.size > 0
 
-      # Reserve access to a block of local ids by creating temporary records to advance the autoincrement counter
-      # TODO I'm pretty sure this is safe because it'll always be used in a transaction, but I should check
-      model.import([model.primary_key.to_sym], [[nil]]*remaining.size, :validate => false, :timestamps => false)
-      last_id = model.last(:select => model.primary_key, :order => model.primary_key).id
-      local_ids = (last_id+1-remaining.size)..last_id
-      model.delete(local_ids)
+      # Reserve access to a block of local ids
+      if model.connection.adapter_name.downcase.include?("postgres")
+        nextval_cmd = model.connection.select_value("SELECT column_default FROM information_schema.columns WHERE table_name = '#{model.table_name}' AND column_name = '#{model.primary_key}'")
+        local_ids = model.connection.select_values("SELECT #{nextval_cmd} FROM generate_series(1,#{remaining.size})").map(&:to_i)
+      else
+        # Reserve access to a block of local ids by creating temporary records to advance the autoincrement counter
+        # TODO I'm pretty sure this is safe because it'll always be used in a transaction, but I should check
+        model.import([model.primary_key.to_sym], [[nil]]*remaining.size, :validate => false, :timestamps => false)
+        last_id = model.last(:select => model.primary_key, :order => model.primary_key).id
+        local_ids = ((last_id+1-remaining.size)..last_id).to_a
+        model.delete(local_ids)
+      end
 
       # Create the corresponding RRSes
       model_state_id = model.offroad_model_state.id
@@ -101,7 +107,7 @@ module Offroad
       # Finally do the redirection to the new ids
       remaining.each_key.each_with_index do |remote_id, i|
         remaining[remote_id].each do |r|
-          r[column] = local_ids.first+i
+          r[column] = local_ids[i]
         end
       end
     end

data/lib/mirror_data.rb

@@ -89,17 +89,28 @@ module Offroad
     end
     
     def delete_all_existing_database_records!
-      # Emptying sqlite_sequence resets SQLite's autoincrement counters.
-      # SQLite's autoincrement is nice in that automatically picks largest ever id + 1.
-      # This means that after clearing sqlite_sequence and then populating database with manually-id'd rows,
-      # new records will be inserted with unique id's, no problem.
-      tables = ["sqlite_sequence"] + ActiveRecord::Base.connection.tables
+      tables = ActiveRecord::Base.connection.tables
+      if ActiveRecord::Base.connection.adapter_name.downcase.include?("sqlite")
+        # Emptying sqlite_sequence resets SQLite's autoincrement counters.
+        # SQLite's autoincrement is nice in that it automatically picks largest ever id + 1.
+        # This means that after clearing sqlite_sequence and then populating database with manually-id'd rows,
+        # new records will be inserted with unique id's, no problem.
+        tables << "sqlite_sequence"
+      end
       
       tables.each do |table|
-        next if table.start_with?("VIRTUAL_") # Used in testing
+        next if table.start_with?("virtual_") # Used in testing # FIXME Should pick something less likely to collide with app name
         next if table == "schema_migrations"
         ActiveRecord::Base.connection.execute "DELETE FROM #{table}"
       end
+        
+      if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgres")
+        # Reset all sequences so that autoincremented ids start from 1 again
+        seqnames = ActiveRecord::Base.connection.select_values "SELECT c.relname FROM pg_class c WHERE c.relkind = 'S'"
+        seqnames.each do |s|
+          ActiveRecord::Base.connection.execute "SELECT setval('#{s}', 1, false)"
+        end
+      end
     end
 
     def write_data(tgt)
@@ -292,6 +303,16 @@ module Offroad
           batch.each { |rec| rec.after_offroad_upload }
         end
       end
+      if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgres")
+        # Need to adjust the sequences so that records inserted from this point on don't collide with existing ids
+        cols = ActiveRecord::Base.connection.select_rows "select table_name, column_name, column_default from information_schema.columns WHERE column_default like 'nextval%'"
+        cols.each do |table_name, column_name, column_default|
+          if column_default =~ /nextval\('(.+)'(?:::.+)?\)/
+            seqname = $1
+            ActiveRecord::Base.connection.execute "SELECT setval('#{seqname}', (SELECT MAX(\"#{column_name}\") FROM \"#{table_name}\"))"
+          end
+        end
+      end
     end
 
     def import_non_initial_model_cargo(cs, model)
@@ -335,6 +356,7 @@ module Offroad
     end
 
     def validate_imported_models(cs)
+      Offroad::group_base_model.connection.clear_query_cache
       while @imported_models_to_validate.size > 0
         model = @imported_models_to_validate.pop
         rrs_source = Offroad::ReceivedRecordState.for_model_and_group_if_apropos(model, @group)

data/lib/model_extensions.rb

@@ -35,13 +35,13 @@ module Offroad
         named_scope :owned_by_offroad_group, lambda { |group| { :conditions => { :id => group.id } } }
         named_scope :offline_groups, {
           :joins =>
-          "INNER JOIN `#{Offroad::GroupState.table_name}` ON `#{Offroad::GroupState.table_name}`.app_group_id = `#{table_name}`.`#{primary_key}`"
+          "INNER JOIN \"#{Offroad::GroupState.table_name}\" ON \"#{Offroad::GroupState.table_name}\".app_group_id = \"#{table_name}\".\"#{primary_key}\""
         }
         named_scope :online_groups, {
           :joins =>
-          "LEFT JOIN `#{Offroad::GroupState.table_name}` ON `#{Offroad::GroupState.table_name}`.app_group_id = `#{table_name}`.`#{primary_key}`",
+          "LEFT JOIN \"#{Offroad::GroupState.table_name}\" ON \"#{Offroad::GroupState.table_name}\".app_group_id = \"#{table_name}\".\"#{primary_key}\"",
           :conditions =>
-          "`#{Offroad::GroupState.table_name}`.app_group_id IS NULL"
+          "\"#{Offroad::GroupState.table_name}\".app_group_id IS NULL"
         }
       when :group_owned then
         named_scope :owned_by_offroad_group, lambda { |group| args_for_ownership_scope(group) }
@@ -117,10 +117,10 @@ module Offroad
       assoc = offroad_parent_assoc
       while true
         if assoc.klass.offroad_group_base?
-          conditions << "`#{assoc_owner.table_name}`.`#{assoc.primary_key_name}` = #{group.id}"
+          conditions << "\"#{assoc_owner.table_name}\".\"#{assoc.primary_key_name}\" = #{group.id}"
           break
         else
-          conditions << "`#{assoc_owner.table_name}`.`#{assoc.primary_key_name}` = `#{assoc.klass.table_name}`.`#{assoc.klass.primary_key}`"
+          conditions << "\"#{assoc_owner.table_name}\".\"#{assoc.primary_key_name}\" = \"#{assoc.klass.table_name}\".\"#{assoc.klass.primary_key}\""
           included_assocs << assoc
           assoc_owner = assoc.klass
           assoc = assoc.klass.offroad_parent_assoc

data/lib/offroad.rb

@@ -11,6 +11,17 @@ $LOAD_PATH << path
 ActiveSupport::Dependencies.autoload_paths << path
 
 require 'ar-extensions' # External dependency
+# Monkey patch a bug in ar-extensions which breaks postgres compatibility
+module ActiveRecord # :nodoc:
+  module ConnectionAdapters # :nodoc:
+    class AbstractAdapter # :nodoc:
+      def next_value_for_sequence(sequence_name)
+        %{nextval('#{sequence_name}')}
+      end
+    end
+  end
+end
+
 
 require 'controller_extensions'
 class ActionController::Base

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Offroad
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/app_root/config/database-pg.yml

@@ -0,0 +1,8 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: offroad_test
+  pool: 5
+  username: david
+  password: foobar
+  min_messages: WARNING

data/test/app_root/config/environment.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), 'boot')
 
+RAILS_GEM_VERSION = '2.3.11'
+
 Rails::Initializer.run do |config|
   config.cache_classes = false
   config.whiny_nils = true
@@ -12,4 +14,11 @@ Rails::Initializer.run do |config|
   else
     HOBO_TEST_MODE = false
   end
+  
+  if ENV['PSQL_TEST_MODE']
+    puts "Using postgresql for a test database"
+    config.database_configuration_file = "#{RAILS_ROOT}/config/database-pg.yml"
+  else
+    puts "Using sqlite for a test database"
+  end
 end

data/test/test_helper.rb

@@ -30,7 +30,11 @@ end
 module Test::Unit::Util::BacktraceFilter
   def filter_backtrace(backtrace, prefix = nil)
     backtrace = backtrace.select do |e|
-      e.include?("offroad") || !(e.include?("/ruby/") || e.include?("/gems/"))
+      if ENV['FULL_BACKTRACE']
+        true
+      else
+        e.include?("offroad") || !(e.include?("/ruby/") || e.include?("/gems/"))
+      end
     end
     
     common_prefix = nil
@@ -101,12 +105,24 @@ class VirtualTestDatabase
   end
     
   def delete_all_rows
-    tables = ["sqlite_sequence"] + ActiveRecord::Base.connection.tables
+    tables = ActiveRecord::Base.connection.tables
+    if ActiveRecord::Base.connection.adapter_name.downcase.include?("sqlite")
+      tables << "sqlite_sequence"
+    end
+
     tables.each do |table|
-      next if table.start_with?("VIRTUAL_")
+      next if table.downcase.start_with?("virtual_")
       next if table == "schema_migrations"
       ActiveRecord::Base.connection.execute "DELETE FROM #{table}"
     end
+
+    if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgres")
+      # Reset all sequences so that autoincremented ids start from 1 again
+      seqnames = ActiveRecord::Base.connection.select_values "SELECT c.relname FROM pg_class c WHERE c.relkind = 'S'"
+      seqnames.each do |s|
+        ActiveRecord::Base.connection.execute "SELECT setval('#{s}', 1, false)"
+      end
+    end
   end
   
   protected
@@ -118,11 +134,11 @@ class VirtualTestDatabase
   private
   
   def normal_prefix
-    "VIRTUAL_normal_#{@prefix}_"
+    "virtual_normal_#{@prefix}_"
   end
   
   def fresh_prefix
-    "VIRTUAL_fresh_#{@prefix}_"
+    "virtual_fresh_#{@prefix}_"
   end
     
   def put_away
@@ -147,13 +163,16 @@ class VirtualTestDatabase
   end
   
   def copy_tables(src_prefix, dst_prefix)
-    tables = ["sqlite_sequence"] + ActiveRecord::Base.connection.tables
+    tables = ActiveRecord::Base.connection.tables
+    if ActiveRecord::Base.connection.adapter_name.downcase.include?("sqlite")
+      tables << "sqlite_sequence"
+    end
     tables.each do |src_table|
       next if src_table.end_with?("schema_migrations")
       next unless src_table.start_with?(src_prefix)
       next if dst_prefix != "" && src_table.start_with?(dst_prefix)
       dst_table = dst_prefix + src_table[(src_prefix.size)..(src_table.size)]
-      next if src_table.start_with?("VIRTUAL") && dst_table.start_with?("VIRTUAL")
+      next if src_table.downcase.start_with?("virtual_") && dst_table.downcase.start_with?("virtual_")
       if tables.include?(dst_table)
         ActiveRecord::Base.connection.execute "DELETE FROM #{dst_table}"
         ActiveRecord::Base.connection.execute "INSERT INTO #{dst_table} SELECT * FROM #{src_table}"
@@ -161,6 +180,24 @@ class VirtualTestDatabase
         ActiveRecord::Base.connection.execute "CREATE TABLE #{dst_table} AS SELECT * FROM #{src_table}"
       end
     end
+        
+    if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgres")
+      # Manage postgresql sequences by keeping non-current sequence vals backed up in Ruby
+      @pg_seq_vals ||= {}
+      if src_prefix.blank?
+        # PG Sequences -> Ruby
+        @pg_seq_vals[dst_prefix] ||= {}
+        seqnames = ActiveRecord::Base.connection.select_values "SELECT c.relname FROM pg_class c WHERE c.relkind = 'S'"
+        seqnames.each do |s|
+          @pg_seq_vals[dst_prefix][s] = ActiveRecord::Base.connection.select_value "SELECT last_value FROM \"#{s}\""
+        end
+      else
+        # Ruby -> PG Sequences
+        @pg_seq_vals[src_prefix].each do |s, v|
+          ActiveRecord::Base.connection.execute "SELECT setval('#{s}', #{v}, true)"
+        end
+      end
+    end
   end
   
   def backup_instance_vars(key)
@@ -280,11 +317,22 @@ end
 class Test::Unit::TestCase
   @@online_database = nil
   @@offline_database = nil
+  @@initial_setup = false
   
   include Test::Unit::Util::BacktraceFilter
   
   def setup
     begin
+      unless @@initial_setup
+        if ActiveRecord::Base.connection.adapter_name.downcase.include?("postgresql")
+          puts "Dropping all postgresql tables"
+          tables = ActiveRecord::Base.connection.tables.each do |table|
+            ActiveRecord::Base.connection.execute "DROP TABLE #{table}"
+          end
+        end
+        @@initial_setup = true
+      end
+
       unless ActiveRecord::Base.connection.table_exists?("schema_migrations")
         # FIXME : Figure out why ActionController::TestCase keeps on deleting all the tables before each method
         

data/test/unit/mirror_data_test.rb

@@ -49,11 +49,23 @@ class MirrorDataTest < Test::Unit::TestCase
     assert_equal @offline_group.id, group_state.app_group_id
   end
 
+  def strip_msecs_in_values(hash)
+    new_hash = {}
+    hash.each do |k,v|
+      if v.is_a?(DateTime) || v.is_a?(Time)
+        new_hash[k] = v.to_i
+      else
+        new_hash[k] = v
+      end
+    end
+    new_hash
+  end
+
   def assert_single_model_cargo_entry_matches(cs, record)
     record.reload
     data_name = Offroad::MirrorData.send(:data_cargo_name_for_model, record.class)
     assert_single_cargo_section_named cs, data_name
-    assert_equal record.attributes, cs.first_cargo_element(data_name).attributes
+    assert_equal strip_msecs_in_values(record.attributes), strip_msecs_in_values(cs.first_cargo_element(data_name).attributes)
   end
 
   def assert_record_not_present(cs, record)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: offroad
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -05:00
+date: 2011-04-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 51
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id001
 description: Offroad manages offline instances of a Rails app on computers without Internet access. The online and offline instances can communicate via mirror files, transported by the user via thumbdrive, burned CD, etc.
@@ -79,6 +81,7 @@ files:
 - test/app_root/app/views/group/upload_up_mirror.html.erb
 - test/app_root/app/views/layouts/mirror.html.erb
 - test/app_root/config/boot.rb
+- test/app_root/config/database-pg.yml
 - test/app_root/config/database.yml
 - test/app_root/config/environment.rb
 - test/app_root/config/environments/test.rb