composite_primary_keys 12.0.9 → 13.0.2

data/lib/composite_primary_keys.rb

@@ -23,7 +23,7 @@
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>6.0.0'
+  gem 'activerecord', '~>6.1.0'
   require 'active_record'
 end
 
@@ -64,6 +64,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/postgresql/database_statements'
 
 require 'active_record/relation/where_clause'
+require 'active_record/table_metadata'
 
 # CPK overrides
 require_relative 'composite_primary_keys/active_model/attribute_assignment'
@@ -87,7 +88,7 @@ require_relative 'composite_primary_keys/associations/association_scope'
 require_relative 'composite_primary_keys/associations/foreign_association'
 require_relative 'composite_primary_keys/associations/has_many_association'
 require_relative 'composite_primary_keys/associations/has_many_through_association'
-require_relative 'composite_primary_keys/associations/join_dependency'
+require_relative 'composite_primary_keys/associations/join_association'
 require_relative 'composite_primary_keys/associations/preloader/association'
 require_relative 'composite_primary_keys/associations/collection_association'
 require_relative 'composite_primary_keys/associations/through_association'
@@ -115,3 +116,4 @@ require_relative 'composite_primary_keys/composite_relation'
 
 require_relative 'composite_primary_keys/arel/to_sql'
 require_relative 'composite_primary_keys/arel/sqlserver'
+require_relative 'composite_primary_keys/table_metadata'

data/scripts/console.rb

@@ -1,48 +1,48 @@
-#!/usr/bin/env ruby
-
-#
-# if run as script, load the file as library while starting irb 
-#
-if __FILE__ == $0
-  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-  ENV['ADAPTER'] = ARGV[0]
-  exec "#{irb} -f -r #{$0} --simple-prompt"
-end
-
-#
-# check if the given adapter is supported (default: mysql)
-#
-adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
-adapter = ENV['ADAPTER'] || 'mysql'
-unless adapters.include? adapter
-  puts "Usage: #{__FILE__} <adapter>"
-  puts ''
-  puts 'Adapters: '
-  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
-  exit 1
-end
-
-#
-# load all necessary libraries
-#
-require 'rubygems'
-require 'local/database_connections'
-
-$LOAD_PATH.unshift 'lib'
-
-begin
-  require 'local/paths'
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
-rescue
-end
-
-require 'active_support'
-require 'active_record'
-
-require "test/connections/native_#{adapter}/connection"
-require 'composite_primary_keys'
-
-PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
-Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
-
+#!/usr/bin/env ruby
+
+#
+# if run as script, load the file as library while starting irb 
+#
+if __FILE__ == $0
+  irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+  ENV['ADAPTER'] = ARGV[0]
+  exec "#{irb} -f -r #{$0} --simple-prompt"
+end
+
+#
+# check if the given adapter is supported (default: mysql)
+#
+adapters = %w[mysql sqlite oracle oracle_enhanced postgresql ibm_db]
+adapter = ENV['ADAPTER'] || 'mysql'
+unless adapters.include? adapter
+  puts "Usage: #{__FILE__} <adapter>"
+  puts ''
+  puts 'Adapters: '
+  puts adapters.map{ |adapter| "    #{adapter}" }.join("\n")
+  exit 1
+end
+
+#
+# load all necessary libraries
+#
+require 'rubygems'
+require 'local/database_connections'
+
+$LOAD_PATH.unshift 'lib'
+
+begin
+  require 'local/paths'
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
+rescue
+end
+
+require 'active_support'
+require 'active_record'
+
+require "test/connections/native_#{adapter}/connection"
+require 'composite_primary_keys'
+
+PROJECT_ROOT = File.join(File.dirname(__FILE__), '..')
+Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }
+

data/scripts/txt2html

@@ -1,76 +1,76 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-gem 'RedCloth'
-gem 'syntax'
-
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-       return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
-  
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+gem 'RedCloth'
+gem 'syntax'
+
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+       return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class=\"syntax\">#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/scripts/txt2js

@@ -1,65 +1,65 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require 'active_support'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-      return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.js'
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text)
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require 'active_support'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+      return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.js'
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text)
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/tasks/databases/mysql.rake

@@ -1,40 +1,40 @@
-namespace :mysql do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :mysql)
-  end
-
-  task :create_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    ActiveRecord::Base.clear_all_connections!
-    new_spec = spec.dup
-    new_spec.delete('database')
-    connection = ActiveRecord::Base.establish_connection(new_spec)
-    ActiveRecord::Base.connection.create_database(spec['database'], charset: spec['charset'] || 'utf8mb4')
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the MySQL test database'
-  task :build_database => [:create_database] do
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
-
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    connection = ActiveRecord::Base.establish_connection(spec)
-    sql.split(";").each do |statement|
-      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
-    end
-  end
-
-  desc 'Drop the MySQL test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.drop_database(spec['database'])
-  end
-
-  desc 'Rebuild the MySQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :mysql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :mysql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    ActiveRecord::Base.clear_all_connections!
+    new_spec = spec.dup
+    new_spec.delete('database')
+    connection = ActiveRecord::Base.establish_connection(new_spec)
+    ActiveRecord::Base.connection.create_database(spec['database'], charset: spec['charset'] || 'utf8mb4')
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the MySQL test database'
+  task :build_database => [:create_database] do
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
+
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    sql.split(";").each do |statement|
+      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
+    end
+  end
+
+  desc 'Drop the MySQL test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+  end
+
+  desc 'Rebuild the MySQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/oracle.rake

@@ -1,41 +1,41 @@
-namespace :oracle do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :oracle)
-  end
-
-  desc 'Build the Oracle test database'
-  task :build_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sql = File.read(schema)
-
-    sql.split(';').each do |command|
-      ActiveRecord::Base.connection.execute(command) unless command.blank?
-    end
-
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Drop the Oracle test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
-    sql = File.read(schema)
-
-    sql.split(';').each do |command|
-      ActiveRecord::Base.connection.execute(command)
-    end
-
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the Oracle test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :oracle do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :oracle)
+  end
+
+  desc 'Build the Oracle test database'
+  task :build_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command) unless command.blank?
+    end
+
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the Oracle test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command)
+    end
+
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the Oracle test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/postgresql.rake

@@ -1,39 +1,39 @@
-namespace :postgresql do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :postgresql)
-  end
-
-  task :create_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec.dup.merge('database' => 'postgres'))
-    ActiveRecord::Base.connection.create_database(spec['database'])
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the Postgresql test database'
-  task :build_database => :create_database do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    connection = ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sql = File.read(schema)
-
-    ActiveRecord::Base.connection.execute(sql)
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Drop the Postgresql test database'
-  task :drop_database  => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    connection = ActiveRecord::Base.establish_connection(spec.merge('database' => 'postgres'))
-    ActiveRecord::Base.connection.drop_database(spec['database'])
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the PostgreSQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
+namespace :postgresql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :postgresql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec.dup.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.create_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the Postgresql test database'
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.read(schema)
+
+    ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the Postgresql test database'
+  task :drop_database  => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the PostgreSQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
 end