rubyrep 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.2 2009-05-10
+
+* Bug fix: escape primary keys in replication triggers
+
 == 1.1.1 2009-02-02
 
 * Feature: optional use of an SQL logger

data/lib/rubyrep/configuration.rb

@@ -19,8 +19,8 @@ module RR
     #   * a logger instance itself (Logger or Log4r::Logger) or
     #   * the parameter to create a Logger with Logger.new
     #   Examples:
-    #     +config.left[:logger] = STDOUT
-    #     +config.right[:logger] = Logger.new('rubyrep_debug.log')
+    #     config.left[:logger] = STDOUT
+    #     config.right[:logger] = Logger.new('rubyrep_debug.log')
     attr_accessor :right
     
     # Returns true unless running on windows...

data/lib/rubyrep/replication_extenders/mysql_replication.rb

@@ -39,7 +39,7 @@ module RR
       # * +params+: the parameter hash as described in #create_rep_trigger
       def key_clause(trigger_var, params)
         "concat_ws('#{params[:key_sep]}', " +
-          params[:keys].map { |key| "'#{key}', #{trigger_var}.#{key}"}.join(", ") +
+          params[:keys].map { |key| "'#{key}', #{trigger_var}.#{quote_column_name(key)}"}.join(", ") +
           ")"
       end
       private :key_clause

data/lib/rubyrep/replication_extenders/postgresql_replication.rb

@@ -10,7 +10,7 @@ module RR
       # * +params+: the parameter hash as described in #create_rep_trigger
       def key_clause(trigger_var, params)
         params[:keys].
-          map { |key| "'#{key}#{params[:key_sep]}' || #{trigger_var}.#{key}"}.
+          map { |key| "'#{key}#{params[:key_sep]}' || #{trigger_var}.#{quote_column_name(key)}"}.
           join(" || '#{params[:key_sep]}' || ")
       end
       private :key_clause

data/lib/rubyrep/version.rb

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

data/spec/strange_name_support_spec.rb

@@ -64,7 +64,7 @@ describe "Unusual table and column name support" do
     end
   end
 
-  it "should support trigger operations" do
+  it "should support trigger operations for strange tables" do
     trigger_name = 'rr_' + STRANGE_TABLE
     session = Session.new
     begin
@@ -98,4 +98,38 @@ describe "Unusual table and column name support" do
       session.left.execute "delete from rr_pending_changes"
     end
   end
+
+  it "should support trigger operations for table with strange primary keys" do
+    trigger_name = 'rr_table_with_strange_key'
+    session = Session.new
+    begin
+      session.left.replication_trigger_exists?(trigger_name, :table_with_strange_key).should be_false
+      session.left.create_replication_trigger({
+          :trigger_name => trigger_name,
+          :table => :table_with_strange_key,
+          :keys => [STRANGE_COLUMN],
+          :log_table => 'rr_pending_changes',
+          :activity_table => 'rr_running_flags',
+          :key_sep => '|',
+          :exclude_rr_activity => true
+        })
+      session.left.replication_trigger_exists?(trigger_name, :table_with_strange_key).should be_true
+      session.left.insert_record 'table_with_strange_key', {
+        STRANGE_COLUMN => '11'
+      }
+      log_record = session.left.select_one(
+        "select * from rr_pending_changes where change_table = 'table_with_strange_key'")
+      log_record['change_key'].should == "#{STRANGE_COLUMN}|11"
+      log_record['change_type'].should == 'I'
+
+      session.left.drop_replication_trigger trigger_name, :table_with_strange_key
+      session.left.replication_trigger_exists?(trigger_name, :table_with_strange_key).should be_false
+    ensure
+      if session.left.replication_trigger_exists?(trigger_name, :table_with_strange_key)
+        session.left.drop_replication_trigger trigger_name, :table_with_strange_key
+      end
+      session.left.execute "delete from #{session.left.quote_table_name(:table_with_strange_key)}"
+      session.left.execute "delete from rr_pending_changes"
+    end
+  end
 end

data/tasks/database.rake

@@ -271,6 +271,15 @@ def create_sample_schema(database, config)
       return name, nil
     end
 
+    create_table :table_with_strange_key, :id => false do |t|
+      t.column STRANGE_COLUMN, :integer
+    end
+
+    ActiveRecord::Base.connection.execute(<<-end_sql)
+      ALTER TABLE table_with_strange_key ADD CONSTRAINT table_with_strange_key_pkey
+        PRIMARY KEY (#{ActiveRecord::Base.connection.quote_column_name(STRANGE_COLUMN)})
+    end_sql
+
     create_table STRANGE_TABLE do |t|
       t.column :first_fk, :integer
       t.column :second_fk, :integer
@@ -330,6 +339,7 @@ def drop_sample_schema(config)
   ActiveRecord::Schema.define do
     drop_table :rr_referencing rescue nil
     drop_table :rr_duplicate rescue nil
+    drop_table :table_with_strange_key rescue nil
     drop_table STRANGE_TABLE rescue nil
     drop_table :extender_type_check rescue nil
     drop_table :extender_no_record rescue nil

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubyrep
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Arndt Lehmann
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +09:00
+date: 2010-05-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
         version: 2.4.0
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Asynchronous master-master replication of relational databases.
 email: mail@arndtlehman.com
 executables: 
@@ -219,18 +236,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubyrep
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Asynchronous master-master replication of relational databases.