rubyrep 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,12 @@
+== 1.0.3 ???
+
+* Minor enhancements:
+  * Added support (and according tests) for non-standard table / column names
+  * Verified compatibility with jruby 1.3.0
+
+* Bug fixes:
+  * Also big exception messages should be accommodated in event log table.
+
 == 1.0.2 2009-06-13
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -84,6 +84,7 @@ spec/database_rake_spec.rb
 spec/db_specific_connection_extenders_spec.rb
 spec/db_specific_replication_extenders_spec.rb
 spec/direct_table_scan_spec.rb
+spec/dolphins.jpg
 spec/generate_runner_spec.rb
 spec/initializer_spec.rb
 spec/logged_change_spec.rb
@@ -113,6 +114,7 @@ spec/scan_summary_reporter_spec.rb
 spec/session_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+spec/strange_name_support_spec.rb
 spec/sync_helper_spec.rb
 spec/sync_runner_spec.rb
 spec/syncers_spec.rb
@@ -135,3 +137,4 @@ tasks/rspec.rake
 tasks/rubyrep.tailor
 tasks/stats.rake
 tasks/task_helper.rb
+tasks/website.rake

data/lib/rubyrep/configuration.rb

@@ -37,6 +37,7 @@ module RR
       :right_sequence_offset => 1,
       :replication_interval => 1,
       :auto_key_limit => 0,
+      :database_connection_timeout => 5,
 
       :rep_prefix => 'rr',
       :key_sep => '|',
@@ -109,6 +110,8 @@ module RR
     #   E. g. with a +sequence_increment+ of 2, an offset of 0 will produce even,
     #   an offset of 1 will produce odd numbers.
     # * :+replication_interval+: time in seconds between replication runs
+    # * :+database_connection_timeout+:
+    #   Time in seconds after which database connections time out.
     attr_reader :options
     
     # Merges the specified +options+ hash into the existing options

data/lib/rubyrep/connection_extenders/jdbc_extender.rb

@@ -17,7 +17,8 @@ module RR
 
       # Returns an ordered list of primary key column names of the given table
       def primary_key_names(table)
-        if not tables.include? table
+        if tables.grep(/^#{table}$/i).empty?
+          # Note: Cannot use tables.include? as returned tables are made lowercase under JRuby MySQL
           raise "table '#{table}' does not exist"
         end
         columns = []
@@ -81,12 +82,12 @@ module RR
       #  - ::regclass is a function that gives the id for a table name
       def column_definitions(table_name) #:nodoc:
         rows = select_all(<<-end_sql)
-            SELECT a.attname as name, format_type(a.atttypid, a.atttypmod) as type, d.adsrc as default, a.attnotnull as notnull
-              FROM pg_attribute a LEFT JOIN pg_attrdef d
-                ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-             WHERE a.attrelid = '#{table_name}'::regclass
-               AND a.attnum > 0 AND NOT a.attisdropped
-             ORDER BY a.attnum
+          SELECT a.attname as name, format_type(a.atttypid, a.atttypmod) as type, d.adsrc as default, a.attnotnull as notnull
+            FROM pg_attribute a LEFT JOIN pg_attrdef d
+              ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+           WHERE a.attrelid = (SELECT oid FROM pg_class WHERE relname = '#{table_name}')
+             AND a.attnum > 0 AND NOT a.attisdropped
+           ORDER BY a.attnum
         end_sql
           
         rows.map do |row|

data/lib/rubyrep/connection_extenders/postgresql_extender.rb

@@ -153,6 +153,22 @@ module RR
     end
     result
   end
+
+  # *** Monkey patch***
+  # Returns the list of a table's column names, data types, and default values.
+  # This overwrites the according ActiveRecord::PostgreSQLAdapter method
+  # to work with tables containing a dot (".").
+  def column_definitions(table_name) #:nodoc:
+    query <<-end_sql
+      SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+        FROM pg_attribute a LEFT JOIN pg_attrdef d
+          ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+       WHERE a.attrelid = (SELECT oid FROM pg_class WHERE relname = '#{table_name}')
+         AND a.attnum > 0 AND NOT a.attisdropped
+       ORDER BY a.attnum
+    end_sql
+  end
+
 end
 end
 end

data/lib/rubyrep/replication_extenders/mysql_replication.rb

@@ -9,7 +9,7 @@ module RR
       # See #create_replication_trigger for a descriptions of the +params+ hash.
       def create_or_replace_replication_trigger_function(params)
         execute(<<-end_sql)
-          DROP PROCEDURE IF EXISTS #{params[:trigger_name]};
+          DROP PROCEDURE IF EXISTS `#{params[:trigger_name]}`;
         end_sql
         
         activity_check = ""
@@ -24,7 +24,7 @@ module RR
         end
 
         execute(<<-end_sql)
-          CREATE PROCEDURE #{params[:trigger_name]}(change_key varchar(2000), change_new_key varchar(2000), change_type varchar(1))
+          CREATE PROCEDURE `#{params[:trigger_name]}`(change_key varchar(2000), change_new_key varchar(2000), change_type varchar(1))
           p: BEGIN
             #{activity_check}
             INSERT INTO #{params[:log_table]}(change_table, change_key, change_new_key, change_type, change_time)
@@ -59,7 +59,7 @@ module RR
 
         %w(insert update delete).each do |action|
           execute(<<-end_sql)
-            DROP TRIGGER IF EXISTS #{params[:trigger_name]}_#{action};
+            DROP TRIGGER IF EXISTS `#{params[:trigger_name]}_#{action}`;
           end_sql
 
           # The created triggers can handle the case where the trigger procedure
@@ -73,13 +73,13 @@ module RR
 
           trigger_var = action == 'delete' ? 'OLD' : 'NEW'
           if action == 'update'
-            call_statement = "CALL #{params[:trigger_name]}(#{key_clause('OLD', params)}, #{key_clause('NEW', params)}, '#{action[0,1].upcase}');"
+            call_statement = "CALL `#{params[:trigger_name]}`(#{key_clause('OLD', params)}, #{key_clause('NEW', params)}, '#{action[0,1].upcase}');"
           else
-            call_statement = "CALL #{params[:trigger_name]}(#{key_clause(trigger_var, params)}, null, '#{action[0,1].upcase}');"
+            call_statement = "CALL `#{params[:trigger_name]}`(#{key_clause(trigger_var, params)}, null, '#{action[0,1].upcase}');"
           end
           execute(<<-end_sql)
-            CREATE TRIGGER #{params[:trigger_name]}_#{action}
-              AFTER #{action} ON #{params[:table]} FOR EACH ROW BEGIN
+            CREATE TRIGGER `#{params[:trigger_name]}_#{action}`
+              AFTER #{action} ON `#{params[:table]}` FOR EACH ROW BEGIN
                 DECLARE number_attempts INT DEFAULT 0;
                 DECLARE failed INT;
                 DECLARE CONTINUE HANDLER FOR 1305 BEGIN
@@ -102,9 +102,9 @@ module RR
       # * +table_name+: name of the table for which the trigger exists
       def drop_replication_trigger(trigger_name, table_name)
         %w(insert update delete).each do |action|
-          execute "DROP TRIGGER #{trigger_name}_#{action};"
+          execute "DROP TRIGGER `#{trigger_name}_#{action}`;"
         end
-        execute "DROP PROCEDURE #{trigger_name};"
+        execute "DROP PROCEDURE `#{trigger_name}`;"
       end
 
       # Returns +true+ if the named trigger exists for the named table.
@@ -129,7 +129,7 @@ module RR
       def sequence_values(rep_prefix, table_name)
         # check if the table has an auto_increment column, return if not
         sequence_row = select_one(<<-end_sql)
-          show columns from #{table_name} where extra = 'auto_increment'
+          show columns from `#{table_name}` where extra = 'auto_increment'
         end_sql
         return {} unless sequence_row
         column_name = sequence_row['Field']
@@ -154,7 +154,7 @@ module RR
         sequence_row = select_one("select current_value, increment, offset from #{sequence_table_name} where name = '#{table_name}'")
         if sequence_row == nil
           current_max = select_one(<<-end_sql)['current_max'].to_i
-            select max(#{column_name}) as current_max from #{table_name}
+            select max(`#{column_name}`) as current_max from `#{table_name}`
           end_sql
           return {column_name => {
               :increment => 1,
@@ -177,9 +177,9 @@ module RR
       # * +increment+: increment of the sequence
       # * +offset+: offset
       # * +left_sequence_values+:
-      #    hash as returned by #outdated_sequence_values for the left database
+      #    hash as returned by #sequence_values for the left database
       # * +right_sequence_values+:
-      #    hash as returned by #outdated_sequence_values for the right database
+      #    hash as returned by #sequence_values for the right database
       # * +adjustment_buffer+:
       #    the "gap" that is created during sequence update to avoid concurrency problems
       # E. g. an increment of 2 and offset of 1 will lead to generation of odd
@@ -207,17 +207,17 @@ module RR
           end_sql
           trigger_name = "#{rep_prefix}_#{table_name}_sequence"
           execute(<<-end_sql)
-            DROP TRIGGER IF EXISTS #{trigger_name};
+            DROP TRIGGER IF EXISTS `#{trigger_name}`;
           end_sql
 
           execute(<<-end_sql)
-            CREATE TRIGGER #{trigger_name}
-              BEFORE INSERT ON #{table_name} FOR EACH ROW BEGIN
-                IF NEW.#{column_name} = 0 THEN
+            CREATE TRIGGER `#{trigger_name}`
+              BEFORE INSERT ON `#{table_name}` FOR EACH ROW BEGIN
+                IF NEW.`#{column_name}` = 0 THEN
                   UPDATE #{sequence_table_name}
                     SET current_value = LAST_INSERT_ID(current_value + increment)
                     WHERE name = '#{table_name}';
-                  SET NEW.#{column_name} = LAST_INSERT_ID();
+                  SET NEW.`#{column_name}` = LAST_INSERT_ID();
                 END IF;
               END;
           end_sql
@@ -256,7 +256,7 @@ module RR
             and trigger_name = '#{trigger_name}'
           end_sql
           if trigger_row
-          execute "DROP TRIGGER #{trigger_name}"
+          execute "DROP TRIGGER `#{trigger_name}`"
           execute "delete from #{sequence_table_name} where name = '#{table_name}'"
           unless select_one("select * from #{sequence_table_name}")
             # no more sequences left --> delete sequence table

data/lib/rubyrep/replication_extenders/postgresql_replication.rb

@@ -35,7 +35,7 @@ module RR
 
         # now create the trigger
         execute(<<-end_sql)
-          CREATE OR REPLACE FUNCTION #{params[:trigger_name]}() RETURNS TRIGGER AS $change_trigger$
+          CREATE OR REPLACE FUNCTION "#{params[:trigger_name]}"() RETURNS TRIGGER AS $change_trigger$
             BEGIN
               #{activity_check}
               IF (TG_OP = 'DELETE') THEN
@@ -69,9 +69,9 @@ module RR
         create_or_replace_replication_trigger_function params
 
         execute(<<-end_sql)
-          CREATE TRIGGER #{params[:trigger_name]}
-          AFTER INSERT OR UPDATE OR DELETE ON #{params[:table]}
-              FOR EACH ROW EXECUTE PROCEDURE #{params[:trigger_name]}();
+          CREATE TRIGGER "#{params[:trigger_name]}"
+          AFTER INSERT OR UPDATE OR DELETE ON "#{params[:table]}"
+              FOR EACH ROW EXECUTE PROCEDURE "#{params[:trigger_name]}"();
         end_sql
       end
 
@@ -79,8 +79,8 @@ module RR
       # * +trigger_name+: name of the trigger
       # * +table_name+: name of the table for which the trigger exists
       def drop_replication_trigger(trigger_name, table_name)
-        execute "DROP TRIGGER #{trigger_name} ON #{table_name};"
-        execute "DROP FUNCTION #{trigger_name}();"
+        execute "DROP TRIGGER \"#{trigger_name}\" ON \"#{table_name}\";"
+        execute "DROP FUNCTION \"#{trigger_name}\"();"
       end
 
       # Returns +true+ if the named trigger exists for the named table.
@@ -117,7 +117,7 @@ module RR
           and t.relname = '#{table_name}'
         end_sql
         sequence_names.each do |sequence_name|
-          row = select_one("select last_value, increment_by from #{sequence_name}")
+          row = select_one("select last_value, increment_by from \"#{sequence_name}\"")
           result[sequence_name] = {
             :increment => row['increment_by'].to_i,
             :value => row['last_value'].to_i
@@ -133,9 +133,9 @@ module RR
       # * +increment+: increment of the sequence
       # * +offset+: offset
       # * +left_sequence_values+:
-      #    hash as returned by #outdated_sequence_values for the left database
+      #    hash as returned by #sequence_values for the left database
       # * +right_sequence_values+:
-      #    hash as returned by #outdated_sequence_values for the right database
+      #    hash as returned by #sequence_values for the right database
       # * +adjustment_buffer+:
       #    the "gap" that is created during sequence update to avoid concurrency problems
       # E. g. an increment of 2 and offset of 1 will lead to generation of odd
@@ -144,7 +144,7 @@ module RR
           rep_prefix, table_name, increment, offset,
           left_sequence_values, right_sequence_values, adjustment_buffer)
         left_sequence_values.each do |sequence_name, left_current_value|
-          row = select_one("select last_value, increment_by from #{sequence_name}")
+          row = select_one("select last_value, increment_by from \"#{sequence_name}\"")
           current_increment = row['increment_by'].to_i
           current_value = row['last_value'].to_i
           unless current_increment == increment and current_value % increment == offset

data/lib/rubyrep/replication_helper.rb

@@ -5,6 +5,8 @@ module RR
   # for third party replicators.
   class ReplicationHelper
 
+    include LogHelper
+
     # The current +ReplicationRun+ instance
     attr_accessor :replication_run
 
@@ -74,7 +76,7 @@ module RR
         end
         key = key_parts.join(', ')
       end
-      rep_details = details == nil ? nil : details[0...ReplicationInitializer::LONG_DESCRIPTION_SIZE]
+      rep_outcome, rep_details = fit_description_columns(outcome, details)
       diff_dump = diff.to_yaml[0...ReplicationInitializer::DIFF_DUMP_SIZE]
       
       session.left.insert_record "#{options[:rep_prefix]}_logged_events", {
@@ -84,7 +86,7 @@ module RR
         :change_key => key,
         :left_change_type => (diff.changes[:left] ? diff.changes[:left].type.to_s : nil),
         :right_change_type => (diff.changes[:right] ? diff.changes[:right].type.to_s : nil),
-        :description => outcome.to_s,
+        :description => rep_outcome,
         :long_description => rep_details,
         :event_time => Time.now,
         :diff_dump => diff_dump

data/lib/rubyrep/replication_initializer.rb

@@ -124,7 +124,10 @@ module RR
     # Size of the replication log column diff_dump
     DIFF_DUMP_SIZE = 2000
 
-    # Size of the repliation log column long_description
+    # Size fo the event log column 'description'
+    DESCRIPTION_SIZE = 255
+
+    # Size of the event log column 'long_description'
     LONG_DESCRIPTION_SIZE = 1000
 
     # Ensures that create_table and related statements don't print notices to
@@ -153,7 +156,7 @@ module RR
           t.column :change_key, :string
           t.column :left_change_type, :string
           t.column :right_change_type, :string
-          t.column :description, :string
+          t.column :description, :string, :limit => DESCRIPTION_SIZE
           t.column :long_description, :string, :limit => LONG_DESCRIPTION_SIZE
           t.column :event_time, :timestamp
           t.column :diff_dump, :string, :limit => DIFF_DUMP_SIZE

data/lib/rubyrep/replication_run.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module RR
   
   # Executes a single replication run
@@ -20,9 +22,11 @@ module RR
     # Executes the replication run.
     def run
       return unless [:left, :right].any? do |database|
-        session.send(database).select_one(
-          "select id from #{session.configuration.options[:rep_prefix]}_pending_changes"
-        ) != nil
+        Timeout::timeout(session.configuration.options[:database_connection_timeout]) do
+          session.send(database).select_one(
+            "select id from #{session.configuration.options[:rep_prefix]}_pending_changes"
+          ) != nil
+        end
       end
       begin
         success = false

data/lib/rubyrep/replicators/two_way_replicator.rb

@@ -225,7 +225,7 @@ module RR
         values = rep_helper.load_record source_db, source_table, source_key
         if values == nil
           diff.amend
-          replicate_difference diff, remaining_attempts - 1
+          replicate_difference diff, remaining_attempts - 1, "source record for insert vanished"
         else
           begin
             # note: savepoints have to be used for postgresql (as a failed SQL
@@ -238,7 +238,8 @@ module RR
             row = rep_helper.load_record target_db, target_table, source_key
             raise unless row # problem is not the existence of the record in the target db
             diff.amend
-            replicate_difference diff, remaining_attempts - 1
+            replicate_difference diff, remaining_attempts - 1,
+              "insert failed with #{e.message}"
           end
         end
       end
@@ -260,14 +261,14 @@ module RR
         values = rep_helper.load_record source_db, source_table, source_key
         if values == nil
           diff.amend
-          replicate_difference diff, remaining_attempts - 1
+          replicate_difference diff, remaining_attempts - 1, "source record for update vanished"
         else
           log_replication_outcome source_db, diff
           rep_helper.update_record target_db, target_table, values, target_key
         end
       end
 
-      # Attempts delete the source record from the target database.
+      # Attempts to delete the source record from the target database.
       # E. g. if +source_db is :+left+, then the record is deleted in database
       # :+right+.
       # * +source_db+: either :+left+ or :+right+ - source database of replication
@@ -284,8 +285,9 @@ module RR
       # Called to replicate the specified difference.
       # * :+diff+: ReplicationDifference instance
       # * :+remaining_attempts+: how many more times a replication will be attempted
-      def replicate_difference(diff, remaining_attempts = MAX_REPLICATION_ATTEMPTS)
-        raise Exception, "max replication attempts exceeded" if remaining_attempts == 0
+      # * :+previous_failure_description+: why the previous replication attempt failed
+      def replicate_difference(diff, remaining_attempts = MAX_REPLICATION_ATTEMPTS, previous_failure_description = nil)
+        raise Exception, previous_failure_description || "max replication attempts exceeded" if remaining_attempts == 0
         options = options_for_table(diff.changes[:left].table)
         if diff.type == :left or diff.type == :right
           key = diff.type == :left ? :left_change_handling : :right_change_handling

data/lib/rubyrep/sync_helper.rb

@@ -5,6 +5,8 @@ module RR
   # for third party syncers.
   class SyncHelper
 
+    include LogHelper
+
     # The current +TableSync+ instance
     attr_accessor :table_sync
 
@@ -81,7 +83,7 @@ module RR
         end
         key = key_parts.join(', ')
       end
-      sync_details = details == nil ? nil : details[0...ReplicationInitializer::LONG_DESCRIPTION_SIZE]
+      sync_outcome, sync_details = fit_description_columns(outcome, details)
 
       session.left.insert_record "#{sync_options[:rep_prefix]}_logged_events", {
         :activity => 'sync',
@@ -90,7 +92,7 @@ module RR
         :change_key => key,
         :left_change_type => nil,
         :right_change_type => nil,
-        :description => outcome.to_s,
+        :description => sync_outcome,
         :long_description => sync_details,
         :event_time => Time.now,
         :diff_dump => nil

data/lib/rubyrep/table_scan.rb

@@ -30,8 +30,8 @@ module RR
       return unless progress_printer
       unless @progress_printer_instance
         total_records =
-          session.left.select_one("select count(*) as n from #{left_table}")['n'].to_i +
-          session.right.select_one("select count(*) as n from #{right_table}")['n'].to_i
+          session.left.select_one("select count(*) as n from #{session.left.quote_table_name(left_table)}")['n'].to_i +
+          session.right.select_one("select count(*) as n from #{session.right.quote_table_name(right_table)}")['n'].to_i
         @progress_printer_instance = progress_printer.new(total_records, session, left_table, right_table)
       end
       @progress_printer_instance.step(steps)

data/lib/rubyrep/version.rb

@@ -2,7 +2,7 @@ module RR #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rubyrep.rb

@@ -34,6 +34,7 @@ require 'base_runner'
 require 'scan_runner'
 require 'committers/committers'
 require 'committers/buffered_committer'
+require 'log_helper'
 require 'sync_helper'
 require 'table_sorter'
 require 'table_sync'

data/spec/replication_helper_spec.rb

@@ -92,6 +92,11 @@ describe ReplicationHelper do
       left_change.table = right_change.table = 'extender_combined_key'
       left_change.key = right_change.key = {'first_id' => 1, 'second_id' => 2}
 
+      # Verify that the log information are made fitting
+      helper.should_receive(:fit_description_columns).
+        with('ignore', 'ignored').
+        and_return(['ignoreX', 'ignoredY'])
+
       helper.log_replication_outcome diff, 'ignore', 'ignored'
 
       row = session.left.select_one("select * from rr_logged_events order by id desc")
@@ -101,8 +106,8 @@ describe ReplicationHelper do
       row['change_key'].should == '"first_id"=>"1", "second_id"=>"2"'
       row['left_change_type'].should == 'update'
       row['right_change_type'].should == 'delete'
-      row['description'].should == 'ignore'
-      row['long_description'].should == 'ignored'
+      row['description'].should == 'ignoreX'
+      row['long_description'].should == 'ignoredY'
       Time.parse(row['event_time']).should >= 10.seconds.ago
       row['diff_dump'].should == diff.to_yaml
     ensure

data/spec/replication_run_spec.rb

@@ -105,7 +105,8 @@ describe ReplicationRun do
     session.left.begin_db_transaction
     session.right.begin_db_transaction
     begin
-
+      session.left.execute "delete from rr_pending_changes"
+      session.left.execute "delete from rr_logged_events"
       session.left.insert_record 'rr_pending_changes', {
         'change_table' => 'extender_no_record',
         'change_key' => 'id|1',
@@ -153,6 +154,7 @@ describe ReplicationRun do
       config.options[:logged_replication_events] = [:all_changes]
 
       session = Session.new(config)
+      session.left.execute "delete from rr_logged_events"
       initializer = ReplicationInitializer.new(session)
       initializer.create_trigger :left, 'extender_no_record'
 

data/spec/spec_helper.rb

@@ -15,6 +15,15 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'rubyrep'
 require 'connection_extender_interface_spec'
 
+unless self.class.const_defined?('STRANGE_TABLE')
+  if ENV['RR_TEST_DB'] == 'postgres' || ENV['RR_TEST_DB'] == nil
+    STRANGE_TABLE = 'table_with.stränge Name山'
+  else
+    STRANGE_TABLE = 'table_with_stränge Name山'
+  end
+  STRANGE_COLUMN = 'stränge. Column山'
+end
+
 class Module
   # Used to verify that an instance of the class / module receives a call of the
   # specified method.

data/spec/strange_name_support_spec.rb

@@ -0,0 +1,90 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+include RR
+
+describe "Unusual table and column name support" do
+  before(:each) do
+    Initializer.configuration = standard_config
+  end
+
+  it "should be able to insert, update and delete records" do
+    session = Session.new
+    session.left.begin_db_transaction
+    begin
+      session.left.insert_record STRANGE_TABLE, {
+        'id' => 1,
+        STRANGE_COLUMN => 'bla'
+      }
+    ensure
+      session.left.rollback_db_transaction
+    end
+  end
+
+  it "should be able to identify primary keys" do
+    session = Session.new
+    session.left.primary_key_names(STRANGE_TABLE).should == ['id']
+  end
+
+  it "should be able to identify referenced tables" do
+    session = Session.new
+    referenced_tables = session.left.referenced_tables([STRANGE_TABLE])
+    referenced_tables.size.should == 1
+    referenced_tables[STRANGE_TABLE].sort.
+      should == ["referenced_table"]
+  end
+
+  it "should support sequence operations" do
+    session = Session.new
+    begin
+      left_sequence_values = session.left.sequence_values('rr', STRANGE_TABLE)
+      right_sequence_values = session.right.sequence_values('rr', STRANGE_TABLE)
+      session.left.update_sequences(
+        'rr', STRANGE_TABLE, 10, 7, left_sequence_values, right_sequence_values, 1)
+
+      sequence_props = session.left.sequence_values('rr', STRANGE_TABLE).values.first
+      sequence_props[:increment].should == 10
+      (sequence_props[:value] % 10).should == 7
+
+      session.left.clear_sequence_setup 'rr', STRANGE_TABLE
+
+      session.left.sequence_values('rr', STRANGE_TABLE).values.first[:increment].should == 1
+    ensure
+      session.left.clear_sequence_setup 'rr', STRANGE_TABLE
+    end
+  end
+
+  it "should support trigger operations" do
+    trigger_name = 'rr_' + STRANGE_TABLE
+    session = Session.new
+    begin
+      session.left.replication_trigger_exists?(trigger_name, STRANGE_TABLE).should be_false
+      session.left.create_replication_trigger({
+          :trigger_name => trigger_name,
+          :table => STRANGE_TABLE,
+          :keys => ['id'],
+          :log_table => 'rr_pending_changes',
+          :activity_table => 'rr_running_flags',
+          :key_sep => '|',
+          :exclude_rr_activity => true
+        })
+      session.left.replication_trigger_exists?(trigger_name, STRANGE_TABLE).should be_true
+      session.left.insert_record STRANGE_TABLE, {
+        'id' => 11,
+        STRANGE_COLUMN => 'blub'
+      }
+      log_record = session.left.select_one(
+        "select * from rr_pending_changes where change_table = '#{STRANGE_TABLE}'")
+      log_record['change_key'].should == 'id|11'
+      log_record['change_type'].should == 'I'
+
+      session.left.drop_replication_trigger trigger_name, STRANGE_TABLE
+      session.left.replication_trigger_exists?(trigger_name, STRANGE_TABLE).should be_false
+    ensure
+      if session.left.replication_trigger_exists?(trigger_name, STRANGE_TABLE)
+        session.left.drop_replication_trigger trigger_name, STRANGE_TABLE
+      end
+      session.left.execute "delete from #{session.left.quote_table_name(STRANGE_TABLE)}"
+      session.left.execute "delete from rr_pending_changes"
+    end
+  end
+end

data/spec/sync_helper_spec.rb

@@ -36,6 +36,11 @@ describe SyncHelper do
       sync = TableSync.new(Session.new, 'scanner_records')
       helper = SyncHelper.new(sync)
 
+      # Verify that the log information are made fitting
+      helper.should_receive(:fit_description_columns).
+        with('my_outcome', 'my_long_description').
+        and_return(['my_outcomeX', 'my_long_descriptionY'])
+
       helper.log_sync_outcome(
         {'bla' => 'blub', 'id' => 1},
         'my_sync_type',
@@ -50,8 +55,8 @@ describe SyncHelper do
       row['change_key'].should == '1'
       row['left_change_type'].should be_nil
       row['right_change_type'].should be_nil
-      row['description'].should == 'my_outcome'
-      row['long_description'].should == 'my_long_description'
+      row['description'].should == 'my_outcomeX'
+      row['long_description'].should == 'my_long_descriptionY'
       Time.parse(row['event_time']).should >= 10.seconds.ago
       row['diff_dump'].should == nil
     ensure

data/tasks/database.rake

@@ -4,6 +4,7 @@ require 'rubyrep'
 
 require File.dirname(__FILE__) + '/task_helper.rb'
 require File.dirname(__FILE__) + '/../config/test_config'
+require File.dirname(__FILE__) + '/../spec/spec_helper'
 
 # Creates the databases for the given configuration hash
 def create_database(config)
@@ -97,7 +98,7 @@ def drop_postgres_schema(config)
   return unless config[:adapter] == 'postgresql'
   ActiveRecord::Base.establish_connection config
   ActiveRecord::Schema.define do
-    execute "drop schema rr cascade"
+    execute "drop schema rr cascade" rescue nil
   end
 end
 
@@ -252,6 +253,18 @@ def create_sample_schema(database, config)
       t.column :name, :string
     end
 
+    create_table STRANGE_TABLE do |t|
+      t.column :first_fk, :integer
+      t.column :second_fk, :integer
+      t.column STRANGE_COLUMN, :string
+    end
+
+    ActiveRecord::Base.connection.execute(<<-end_sql) 
+      ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(STRANGE_TABLE)} ADD CONSTRAINT strange_table_fkey
+        FOREIGN KEY (first_fk, second_fk)
+        REFERENCES referenced_table(first_id, second_id)
+    end_sql
+
     create_table :left_table do |t|
       t.column :name, :string
     end if database == :left
@@ -267,10 +280,10 @@ end
 def drop_sample_schema(config)
   drop_postgres_schema config
 
-  connection = RR::ConnectionExtenders.db_connect(config)
-  ActiveRecord::Base.connection = connection
+  ActiveRecord::Base.establish_connection config
   
   ActiveRecord::Schema.define do
+    drop_table STRANGE_TABLE rescue nil
     drop_table :extender_type_check rescue nil
     drop_table :extender_no_record rescue nil
     drop_table :extender_one_record rescue nil
@@ -285,6 +298,7 @@ def drop_sample_schema(config)
     drop_table :referenced_table2 rescue nil
     drop_table :table_with_manual_key
     drop_table :rr_pending_changes rescue nil
+    drop_table :rr_logged_events rescue nil
     drop_table :rr_running_flags rescue nil
     drop_table :trigger_test rescue nil
     drop_table :sequence_test rescue nil
@@ -412,7 +426,7 @@ namespace :db do
     
     desc "Create the sample schemas"
     task :create_schema do
-      create_sample_schema :left, RR::Initializer.configuration rescue nil
+      create_sample_schema :left, RR::Initializer.configuration
       create_sample_schema :right, RR::Initializer.configuration rescue nil
     end
     
@@ -432,8 +446,8 @@ namespace :db do
       if pid
         Process.wait pid
       else
-        drop_sample_schema RR::Initializer.configuration.left rescue nil
-        drop_sample_schema RR::Initializer.configuration.right rescue nil
+        drop_sample_schema RR::Initializer.configuration.left
+        drop_sample_schema RR::Initializer.configuration.right
         Kernel.exit!
       end
     end

data/tasks/website.rake

@@ -0,0 +1,19 @@
+namespace :website do
+  desc 'Generate website files'
+  task :generate => :ruby_env do
+    (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
+      sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
+    end
+  end
+
+  desc 'Upload website files to rubyforge'
+  task :upload do
+    host = "#{rubyforge_username}@rubyforge.org"
+    remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
+    local_dir = 'website'
+    sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
+  end
+
+  desc 'Generate and upload website files'
+  task :build => [:website_generate, :website_upload, :publish_docs]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyrep
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Arndt Lehmann
@@ -30,7 +30,7 @@ cert_chain:
   NwT26VZnE2nr8g==
   -----END CERTIFICATE-----
 
-date: 2009-06-13 00:00:00 +09:00
+date: 2009-06-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,6 +161,7 @@ files:
 - spec/db_specific_connection_extenders_spec.rb
 - spec/db_specific_replication_extenders_spec.rb
 - spec/direct_table_scan_spec.rb
+- spec/dolphins.jpg
 - spec/generate_runner_spec.rb
 - spec/initializer_spec.rb
 - spec/logged_change_spec.rb
@@ -190,6 +191,7 @@ files:
 - spec/session_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/strange_name_support_spec.rb
 - spec/sync_helper_spec.rb
 - spec/sync_runner_spec.rb
 - spec/syncers_spec.rb
@@ -212,6 +214,7 @@ files:
 - tasks/rubyrep.tailor
 - tasks/stats.rake
 - tasks/task_helper.rb
+- tasks/website.rake
 has_rdoc: true
 homepage: http://rubyrep.rubyforge.org
 post_install_message: