rubyrep 1.2.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dce60ecb06296f28c795f0e6f622f44cfb254f36
+  data.tar.gz: d93b227992e944a55bd0dc465c58e63189fca282
+SHA512:
+  metadata.gz: 0c1617bceecfff4c4337f054db6e34d93a6fc403f10fa4164cd4e66bd6ebf2a1fbf057514dad0c7437dd14b589d0afe9cea745568e8b8e150ed2a86bee642786
+  data.tar.gz: 359351384c8600b69c16dddb46434bf43f2b3f2a82f1c6c6d554b38fd4fea3fce9a0d36cd50961b245d24d5ca2a6ed19f70615819e7ad244b96d88437fb50692

data/.gitignore

@@ -0,0 +1,7 @@
+statsvn/*
+coverage/*
+profile/*
+doc/*
+website/.*\.html$
+pkg/*
+tmp/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -0,0 +1,18 @@
+source 'http://rubygems.org'
+
+gem 'activerecord', '~> 4.2'
+
+gem 'pg', platform: :ruby
+gem 'mysql2', platform: :ruby
+
+gem 'jdbc-postgres', platform: :jruby
+gem 'jdbc-mysql', platform: :jruby
+gem 'activerecord-jdbc-adapter', platform: :jruby
+gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+
+gem 'rspec'
+gem 'crack'
+gem 'awesome_print', require: 'ap'
+gem 'rake'
+gem 'simplecov', :require => false, :group => :test

data/Gemfile.lock

@@ -0,0 +1,84 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activerecord-jdbc-adapter (1.3.23)
+      activerecord (>= 2.2, < 5.0)
+    activerecord-jdbcmysql-adapter (1.3.23)
+      activerecord-jdbc-adapter (~> 1.3.23)
+      jdbc-mysql (>= 5.1.22)
+    activerecord-jdbcpostgresql-adapter (1.3.23)
+      activerecord-jdbc-adapter (~> 1.3.23)
+      jdbc-postgres (>= 9.1)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    awesome_print (1.7.0)
+    builder (3.2.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    i18n (0.8.1)
+    jdbc-mysql (5.1.42)
+    jdbc-postgres (9.4.1206)
+    json (2.0.2)
+    json (2.0.2-java)
+    minitest (5.10.2)
+    mysql2 (0.4.6)
+    pg (0.20.0)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.4)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2)
+  activerecord-jdbc-adapter
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
+  awesome_print
+  crack
+  jdbc-mysql
+  jdbc-postgres
+  mysql2
+  pg
+  rake
+  rspec
+  simplecov
+
+BUNDLED WITH
+   1.14.6

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.0 2017-06-01
+
+* Feature: compatibility with Rails 4, Ruby 2.4 and JRuby 9.1
+* Breaking: specify MySQL support in database config with adapter 'mysql2' instead of 'mysql'
+* Breaking: postgres table names must not contains dots (".") anymore
+
 == 1.2.0 2011-03-07
 
 * Feature: compatibility with Rails 3

data/README.txt

@@ -15,7 +15,7 @@ Refer to the project website at http://www.rubyrep.org
 
 (The MIT License)
 
-Copyright (c) 2009 Arndt Lehmann
+Copyright (c) 2017 Arndt Lehmann
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,30 +1,9 @@
-require 'config/requirements'
-require 'config/hoe' if Object.const_defined? 'Hoe' # setup Hoe + all gem configuration
+namespace :bundler do
+  require "bundler/gem_tasks"
+end
 
-require 'lib/rubyrep'
-require 'tasks/task_helper'
+require_relative 'lib/rubyrep'
+require_relative 'tasks/task_helper'
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
-load 'sims/performance/performance.rake'
-
-desc "Creates the repository commit statistics"
-task :repostats do
-  # phase 0: create the repository tmp directory
-  system 'mkdir -p tmp'
-  # phase 1: migrate the hg repository to svn
-  tailor_path = '~/usr/tailor/tailor'
-  cmd = "#{tailor_path} --use-propset --configfile '#{File.dirname(__FILE__) + '/tasks/rubyrep.tailor'}'"
-  system cmd
-  
-  # phase 2: create the repository statistics through the statsvn library
-  jar_path = '~/usr/statsvn/statsvn.jar'
-  log_path = File.dirname(__FILE__) + '/tmp/statsvn.log'
-  checkout_path = '/tmp/rubyrep_tailor/svn'
-  svnstats_dir = File.dirname(__FILE__) + '/statsvn'
-
-  system "cd #{checkout_path}; svn update"
-  cmd = "cd #{checkout_path}; svn log -v --xml >#{log_path}"
-  system cmd
-  cmd = "java -jar #{jar_path} -output-dir #{svnstats_dir} -exclude 'setup.rb:website/**' #{log_path} #{checkout_path}"
-  system cmd
-end
+load 'sims/performance/performance.rake'

data/bin/rubyrep

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 

data/config/mysql_config.rb

@@ -3,7 +3,7 @@
 
 RR::Initializer::run do |config|
   config.left = {
-    :adapter  => 'mysql',   
+    :adapter  => 'mysql2',
     :database => 'rr_left',   
     :username => 'root',   
     :password => '',   
@@ -13,7 +13,7 @@ RR::Initializer::run do |config|
   }
 
   config.right = {
-    :adapter  => 'mysql',   
+    :adapter  => 'mysql2',
     :database => 'rr_right',   
     :username => 'root',   
     :password => '',   

data/config/postgres_config.rb

@@ -4,10 +4,11 @@
 RR::Initializer::run do |config|
   config.left = {
     :adapter  => 'postgresql',   
-    :database => 'rr_left',   
+    :database => 'rr_left',
     :username => 'postgres',   
     :password => 'password',   
-    :host     => 'localhost'
+    :host     => 'localhost',
+    :min_messages => 'warning'
   }
 
   config.right = {
@@ -15,7 +16,8 @@ RR::Initializer::run do |config|
     :database => 'rr_right',   
     :username => 'postgres',   
     :password => 'password',   
-    :host     => 'localhost'
+    :host     => 'localhost',
+    :min_messages => 'warning'
   }
 
 end

data/lib/rubyrep/command_runner.rb

@@ -32,7 +32,7 @@ module RR
     
     # Prints the version to stderr
     def self.show_version
-      $stdout.puts "rubyrep version #{RR::VERSION::STRING}"
+      $stdout.puts "rubyrep version #{RR::VERSION}"
     end
 
 

data/lib/rubyrep/connection_extenders/connection_extenders.rb

@@ -3,19 +3,6 @@ class ActiveRecord::ConnectionAdapters::AbstractAdapter
   attr_accessor :log_subscriber
 end
 
-class ActiveRecord::ConnectionAdapters::Column
-  # Bug in ActiveRecord parsing of PostgreSQL timestamps with microseconds:
-  # Certain values are incorrectly rounded, thus ending up with timestamps
-  # that are off by one microsecond.
-  # This monkey patch fixes the problem.
-  def self.fast_string_to_time(string)
-    if string =~ Format::ISO_DATETIME
-      microsec = ($7.to_f * 1_000_000).round # used to be #to_i instead
-      new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
-    end
-  end
-end
-
 module RR
   
   # Connection extenders provide additional database specific functionality
@@ -39,10 +26,18 @@ module RR
       @extenders.merge! extender
     end
 
-    # Dummy ActiveRecord descendant only used to create database connections.
-    class DummyActiveRecord < ActiveRecord::Base
+    # Creates a new ActiveRecord::Base descending class that can be used to create and manage
+    # database connections.
+    #
+    # @return [Class] the new ActiveRecord::Base descending class
+    def self.active_record_class_for_database_connection
+      active_record_class = Class.new(ActiveRecord::Base)
+      @active_record_class_counter ||= 0
+      @active_record_class_counter += 1
+      RR.const_set("DummyActiveRecord#{@active_record_class_counter}", active_record_class)
+      active_record_class
     end
-    
+
     # Creates an ActiveRecord database connection according to the provided +config+ connection hash.
     # Possible values of this parameter are described in ActiveRecord::Base#establish_connection.
     # The database connection is extended with the correct ConnectionExtenders module.
@@ -52,38 +47,29 @@ module RR
     # To go around this, we delete ActiveRecord's memory of the existing database connection
     # as soon as it is created.
     def self.db_connect_without_cache(config)
-      if RUBY_PLATFORM =~ /java/
-        adapter = config[:adapter]
-        
-        # As recommended in the activerecord-jdbc-adapter use the jdbc versions
-        # of the Adapters. E. g. instead of "postgresql", "jdbcpostgresql".
-        adapter = 'jdbc' + adapter unless adapter =~ /^jdbc/
+      # active_record_class = active_record_class_for_connection(config)
+      # active_record_class = DummyActiveRecord.dup
+      active_record_class = active_record_class_for_database_connection
+      active_record_class.establish_connection(config)
 
-        DummyActiveRecord.establish_connection(config.merge(:adapter => adapter))
-      else
-        DummyActiveRecord.establish_connection(config)
+
+      # To suppress Postgres debug messages (which cannot be suppress in another way),
+      # temporarily replace stdout.
+      org_stdout = $stdout
+      $stdout = StringIO.new
+      begin
+        connection = active_record_class.connection
+      ensure
+        puts $stdout.string
+        $stdout = org_stdout
       end
-      connection = DummyActiveRecord.connection
-      
-      # Delete the database connection from ActiveRecords's 'memory'
-      ActiveRecord::Base.connection_handler.connection_pools.delete DummyActiveRecord.name
-      
-      extender = ""
-      if RUBY_PLATFORM =~ /java/
-        extender = :jdbc
-      elsif ConnectionExtenders.extenders.include? config[:adapter].to_sym
+
+      if ConnectionExtenders.extenders.include? config[:adapter].to_sym
         extender = config[:adapter].to_sym
       else
         raise "No ConnectionExtender available for :#{config[:adapter]}"
       end
       connection.extend ConnectionExtenders.extenders[extender]
-      
-      # Hack to get Postgres schema support under JRuby to par with the standard
-      # ruby version
-      if RUBY_PLATFORM =~ /java/ and config[:adapter].to_sym == :postgresql
-        connection.extend RR::ConnectionExtenders::PostgreSQLExtender
-        connection.initialize_search_path
-      end
 
       replication_module = ReplicationExtenders.extenders[config[:adapter].to_sym]
       connection.extend replication_module if replication_module
@@ -112,14 +98,15 @@ module RR
         if config[:logger].respond_to?(:debug)
           logger = config[:logger]
         else
-          logger = ActiveSupport::BufferedLogger.new(config[:logger])
+          logger = ActiveSupport::Logger.new(config[:logger])
         end
         db_connection.instance_variable_set :@logger, logger
         if ActiveSupport.const_defined?(:Notifications)
           connection_object_id = db_connection.object_id
           db_connection.log_subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
             if payload[:connection_id] == connection_object_id and logger.debug?
-              logger.debug payload[:sql].squeeze(" ")
+              sql = payload[:sql].squeeze(" ") rescue payload[:sql]
+              logger.debug sql
             end
           end
         end
@@ -146,7 +133,6 @@ module RR
       end
 
       install_logger db_connection, config
-
       db_connection
     end
 

data/lib/rubyrep/connection_extenders/mysql_extender.rb

@@ -4,7 +4,7 @@ module RR
 
     # Provides various MySQL specific functionality required by Rubyrep.
     module MysqlExtender
-      RR::ConnectionExtenders.register :mysql => self
+      RR::ConnectionExtenders.register :mysql2 => self
 
       # Returns an ordered list of primary key column names of the given table
       def primary_key_names(table)
@@ -54,6 +54,28 @@ module RR
         end
         result
       end
+
+      # Quotes the value so it can be used in SQL insert / update statements.
+      #
+      # @param [Object] value the target value
+      # @param [ActiveRecord::ConnectionAdapters::MySQL::Column] column the target column
+      # @return [String] the quoted string
+      def column_aware_quote(value, column)
+        if column.sql_type == 'blob' and RUBY_PLATFORM == 'java'
+          quote(column.type_cast_for_database(value))
+        else
+          quote(value)
+        end
+      end
+
+      # Casts a value returned from the database back into the according ruby type.
+      #
+      # @param [Object] value the received value
+      # @param [ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::Column] column the originating column
+      # @return [Object] the casted value
+      def fixed_type_cast(value, column)
+        column.type_cast_from_database value
+      end
     end
   end
 end

data/lib/rubyrep/connection_extenders/postgresql_extender.rb

@@ -1,83 +1,5 @@
 require 'time'
 
-# Hack:
-# For some reasons these methods were removed in Rails 2.2.2, thus breaking
-# the binary and multi-lingual data loading.
-# So here they are again.
-module ActiveRecord
-  module ConnectionAdapters
-    # PostgreSQL-specific extensions to column definitions in a table.
-    class PostgreSQLColumn < Column #:nodoc:
-
-      # Escapes binary strings for bytea input to the database.
-      def self.string_to_binary(value)
-        if PGconn.respond_to?(:escape_bytea)
-          self.class.module_eval do
-            define_method(:string_to_binary) do |value|
-              PGconn.escape_bytea(value) if value
-            end
-          end
-        else
-          self.class.module_eval do
-            define_method(:string_to_binary) do |value|
-              if value
-                result = ''
-                value.each_byte { |c| result << sprintf('\\\\%03o', c) }
-                result
-              end
-            end
-          end
-        end
-        self.class.string_to_binary(value)
-      end
-
-      # Unescapes bytea output from a database to the binary string it represents.
-      def self.binary_to_string(value)
-        # In each case, check if the value actually is escaped PostgreSQL bytea output
-        # or an unescaped Active Record attribute that was just written.
-        if PGconn.respond_to?(:unescape_bytea)
-          self.class.module_eval do
-            define_method(:binary_to_string) do |value|
-              if value =~ /\\\d{3}/
-                PGconn.unescape_bytea(value)
-              else
-                value
-              end
-            end
-          end
-        else
-          self.class.module_eval do
-            define_method(:binary_to_string) do |value|
-              if value =~ /\\\d{3}/
-                result = ''
-                i, max = 0, value.size
-                while i < max
-                  char = value[i]
-                  if char == ?\\
-                    if value[i+1] == ?\\
-                      char = ?\\
-                      i += 1
-                    else
-                      char = value[i+1..i+3].oct
-                      i += 3
-                    end
-                  end
-                  result << char
-                  i += 1
-                end
-                result
-              else
-                value
-              end
-            end
-          end
-        end
-        self.class.binary_to_string(value)
-      end
-    end
-  end
-end
-
 module RR
   module ConnectionExtenders
 
@@ -107,15 +29,6 @@ module RR
         SQL
       end
 
-      # Disables schema extraction from table names by overwriting the according
-      # ActiveRecord method.
-      # Necessary to support table names containing dots (".").
-      # (This is possible as rubyrep exclusively uses the search_path setting to
-      # support PostgreSQL schemas.)
-      def extract_pg_identifier_from_name(name)
-        return name, nil
-      end
-
       # Returns an ordered list of primary key column names of the given table
       def primary_key_names(table)
         row = self.select_one(<<-end_sql)
@@ -138,7 +51,11 @@ module RR
         
         # Change a Postgres Array of attribute numbers
         # (returned in String form, e. g.: "{1,2}") into an array of Integers
-        column_ids = column_parray.sub(/^\{(.*)\}$/,'\1').split(',').map {|a| a.to_i}
+        if column_parray.kind_of?(Array)
+          column_ids = column_parray # in JRuby the attribute numbers are already returned as array
+        else
+          column_ids = column_parray.sub(/^\{(.*)\}$/,'\1').split(',').map {|a| a.to_i}
+        end
 
         columns = {}
         rows = self.select_all(<<-end_sql)
@@ -186,89 +103,35 @@ module RR
         result
       end
 
-      # Sets the schema search path as per configuration parameters
-      def initialize_search_path
-        execute "SET search_path TO #{config[:schema_search_path] || 'public'}"
+      # Quotes the value so it can be used in SQL insert / update statements.
+      #
+      # @param [Object] value the target value
+      # @param [ActiveRecord::ConnectionAdapters::PostgreSQLColumn] column the target column
+      # @return [String] the quoted string
+      def column_aware_quote(value, column)
+        if column.try(:sql_type) == 'bytea'
+          quoted_value = "'#{escape_bytea value}'"
+          # tests showed that there is a wrong leading double backslash under JRuby
+          quoted_value.sub!(/\\\\/, '\\')
+          quoted_value
+        else
+          quote value
+        end
       end
 
-      # *** Moneky patch***
-      # Returns the column objects for the named table.
-      # Fixes JRuby schema support
-      def columns(table_name, name = nil)
-        jdbc_connection = @connection.connection # the actual JDBC DatabaseConnection
-        @unquoted_schema ||= select_one("show search_path")['search_path']
-
-        # check if table exists
-        table_results = jdbc_connection.meta_data.get_tables(
-          jdbc_connection.catalog,
-          @unquoted_schema,
-          table_name,
-          ["TABLE","VIEW","SYNONYM"].to_java(:string)
-        )
-        table_exists = table_results.next
-        table_results.close
-        raise "table '#{table_name}' not found" unless table_exists
-
-        # get ResultSet for columns of table
-        column_results = jdbc_connection.meta_data.get_columns(
-          jdbc_connection.catalog,
-          @unquoted_schema,
-          table_name,
-          nil
-        )
-        
-        # create the Column objects
-        columns = []
-        while column_results.next
-          
-          # generate type clause
-          type_clause = column_results.get_string('TYPE_NAME')
-          precision = column_results.get_int('COLUMN_SIZE')
-          scale = column_results.get_int('DECIMAL_DIGITS')
-          if precision > 0
-            type_clause += "(#{precision}#{scale > 0 ? ",#{scale}" : ""})"
-          end
-
-          # create column
-          columns << ::ActiveRecord::ConnectionAdapters::JdbcColumn.new(
-            @config,
-            column_results.get_string('COLUMN_NAME'),
-            column_results.get_string('COLUMN_DEF'),
-            type_clause,
-            column_results.get_string('IS_NULLABLE').strip == "NO"
-          )
+      # Casts a value returned from the database back into the according ruby type.
+      #
+      # @param [Object] value the received value
+      # @param [ActiveRecord::ConnectionAdapters::PostgreSQLColumn] column the originating column
+      # @return [Object] the casted value
+      def fixed_type_cast(value, column)
+        if column.sql_type == 'bytea' and RUBY_PLATFORM == 'java'
+          # Apparently in Java / JRuby binary data are automatically unescaped.
+          # So #type_cast_from_database must be prevented from double-unescaping the binary data.
+            value
+        else
+          column.type_cast_from_database value
         end
-        column_results.close
-        
-        columns
-      end if RUBY_PLATFORM =~ /java/
-
-      # *** 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 (".") and
-      # * only look for tables in the current schema search path.
-      def column_definitions(table_name) #:nodoc:
-        rows = self.select_all <<-end_sql
-          SELECT
-            a.attname as name,
-            format_type(a.atttypid, a.atttypmod) as type,
-            d.adsrc as source,
-            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 relnamespace IN
-              (SELECT oid FROM pg_namespace WHERE nspname in (#{schemas}))
-            LIMIT 1
-            )
-            AND a.attnum > 0 AND NOT a.attisdropped
-          ORDER BY a.attnum
-        end_sql
-    
-        rows.map {|row| [row['name'], row['type'], row['source'], row['notnull']]}
       end
 
     end

data/lib/rubyrep/generate_runner.rb

@@ -9,7 +9,7 @@ module RR
     CONFIG_TEMPLATE = <<EOF
 RR::Initializer::run do |config|
   config.left = {
-    :adapter  => 'postgresql', # or 'mysql'
+    :adapter  => 'postgresql', # or 'mysql2'
     :database => 'SCOTT',
     :username => 'scott',
     :password => 'tiger',

data/lib/rubyrep/logged_change.rb

@@ -153,7 +153,7 @@ module RR
 
     # Prevents session from going into YAML output
     def to_yaml_properties
-      instance_variables.sort.reject {|var_name| ['@session', '@loader'].include? var_name}
+      instance_variables.sort.reject {|var_name| [:'@session', :'@loader'].include? var_name}
     end
 
   end