composite_primary_keys 0.9.0 → 0.9.90

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.90 2008-01-27
+
+* Trial release for rails/activerecord 2.0.2 supported
+
+== 0.9.1 2007-10-28
+
+* Migrations fix - allow :primary_key => [:name] to work [no unit test] [thx Shugo Maeda]
+
 == 0.9.0 2007-09-28
 
 * Added support for polymorphs [thx nerdrew]

data/Manifest.txt

@@ -12,12 +12,14 @@ lib/adapter_helper/postgresql.rb
 lib/adapter_helper/sqlite3.rb
 lib/composite_primary_keys.rb
 lib/composite_primary_keys/associations.rb
+lib/composite_primary_keys/attribute_methods.rb
 lib/composite_primary_keys/base.rb
 lib/composite_primary_keys/calculations.rb
 lib/composite_primary_keys/composite_arrays.rb
 lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb
 lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
 lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
+lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 lib/composite_primary_keys/fixtures.rb
 lib/composite_primary_keys/migration.rb
 lib/composite_primary_keys/reflection.rb
@@ -40,7 +42,6 @@ tasks/local_setup.rake
 tasks/website.rake
 test/README_tests.txt
 test/abstract_unit.rb
-test/composite_arrays_test.rb
 test/connections/native_ibm_db/connection.rb
 test/connections/native_mysql/connection.rb
 test/connections/native_oracle/connection.rb
@@ -88,9 +89,13 @@ test/fixtures/tariffs.yml
 test/fixtures/user.rb
 test/fixtures/users.yml
 test/hash_tricks.rb
+test/plugins/pagination.rb
+test/plugins/pagination_helper.rb
 test/test_associations.rb
+test/test_attribute_methods.rb
 test/test_attributes.rb
 test/test_clone.rb
+test/test_composite_arrays.rb
 test/test_create.rb
 test/test_delete.rb
 test/test_dummy.rb

data/lib/adapter_helper/base.rb

@@ -10,8 +10,8 @@ module AdapterHelper
           exit
         end
 
-        all_specs = YAML.load(ENV['cpk_adapters'])
-        unless spec = all_specs[adapter]
+        ActiveRecord::Base.configurations = YAML.load(ENV['cpk_adapters'])
+        unless spec = ActiveRecord::Base.configurations[adapter]
           puts error_msg_adapter_helper
           exit
         end

data/lib/adapter_helper/oracle.rb

@@ -5,7 +5,6 @@ module AdapterHelper
     class << self
       def load_connection_from_env
         spec = super('oracle')
-        spec[:database] ||= 'composite_primary_keys_unittest'
         spec
       end
     end

data/lib/composite_primary_keys.rb

@@ -40,6 +40,7 @@ require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/migration'
+require 'composite_primary_keys/attribute_methods'
 
 ActiveRecord::Base.class_eval do
   include CompositePrimaryKeys::ActiveRecord::Base

data/lib/composite_primary_keys/attribute_methods.rb

@@ -0,0 +1,84 @@
+module CompositePrimaryKeys
+  module ActiveRecord
+    module AttributeMethods #:nodoc:
+      def self.append_features(base)
+        super
+        base.send(:extend, ClassMethods)
+      end
+      
+      module ClassMethods
+        # Define an attribute reader method.  Cope with nil column.
+        def define_read_method(symbol, attr_name, column)
+          cast_code = column.type_cast_code('v') if column
+          cast_code = "::#{cast_code}" if cast_code && cast_code.match('ActiveRecord::.*')
+          access_code = cast_code ? "(v=@attributes['#{attr_name}']) && #{cast_code}" : "@attributes['#{attr_name}']"
+
+          unless self.primary_keys.include?(attr_name.to_sym)
+            access_code = access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
+          end
+          
+          if cache_attribute?(attr_name)
+            access_code = "@attributes_cache['#{attr_name}'] ||= (#{access_code})"
+          end
+
+          evaluate_attribute_method attr_name, "def #{symbol}; #{access_code}; end"
+        end
+
+        # Evaluate the definition for an attribute related method
+        def evaluate_attribute_method(attr_name, method_definition, method_name=attr_name)
+          unless primary_keys.include?(method_name.to_sym)
+            generated_methods << method_name
+          end
+
+          begin
+            class_eval(method_definition, __FILE__, __LINE__)
+          rescue SyntaxError => err
+            generated_methods.delete(attr_name)
+            if logger
+              logger.warn "Exception occurred during reader method compilation."
+              logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?"
+              logger.warn "#{err.message}"
+            end
+          end
+        end
+      end
+
+      # Allows access to the object attributes, which are held in the @attributes hash, as though they
+      # were first-class methods. So a Person class with a name attribute can use Person#name and
+      # Person#name= and never directly use the attributes hash -- except for multiple assigns with
+      # ActiveRecord#attributes=. A Milestone class can also ask Milestone#completed? to test that
+      # the completed attribute is not nil or 0.
+      #
+      # It's also possible to instantiate related objects, so a Client class belonging to the clients
+      # table with a master_id foreign key can instantiate master through Client#master.
+      def method_missing(method_id, *args, &block)
+        method_name = method_id.to_s
+
+        # If we haven't generated any methods yet, generate them, then
+        # see if we've created the method we're looking for.
+        if !self.class.generated_methods?
+          self.class.define_attribute_methods
+
+          if self.class.generated_methods.include?(method_name)
+            return self.send(method_id, *args, &block)
+          end
+        end
+
+        if self.class.primary_keys.include?(method_name.to_sym)
+          ids[self.class.primary_keys.index(method_name.to_sym)]
+        elsif md = self.class.match_attribute_method?(method_name)
+          attribute_name, method_type = md.pre_match, md.to_s
+          if @attributes.include?(attribute_name)
+            __send__("attribute#{method_type}", attribute_name, *args, &block)
+          else
+            super
+          end
+        elsif @attributes.include?(method_name)
+          read_attribute(method_name)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/base.rb

@@ -22,10 +22,12 @@ module CompositePrimaryKeys
           self.primary_keys = keys.to_composite_keys
           
           class_eval <<-EOV
-            extend CompositePrimaryKeys::ActiveRecord::Base::CompositeClassMethods
-            include CompositePrimaryKeys::ActiveRecord::Base::CompositeInstanceMethods
+            extend CompositeClassMethods
+            include CompositeInstanceMethods
+                     
             include CompositePrimaryKeys::ActiveRecord::Associations
-            extend CompositePrimaryKeys::ActiveRecord::Calculations::ClassMethods
+            include CompositePrimaryKeys::ActiveRecord::Calculations
+            include CompositePrimaryKeys::ActiveRecord::AttributeMethods
           EOV
         end
         
@@ -89,44 +91,6 @@ module CompositePrimaryKeys
           end
         end
         
-        # Define an attribute reader method.  Cope with nil column.
-        def define_read_method(symbol, attr_name, column)
-          cast_code = column.type_cast_code('v') if column
-          access_code = cast_code ? "(v=@attributes['#{attr_name}']) && #{cast_code}" : "@attributes['#{attr_name}']"
-          
-          unless self.class.primary_keys.include? attr_name.to_sym
-            access_code = access_code.insert(0, "raise NoMethodError, 'missing attribute: #{attr_name}', caller unless @attributes.has_key?('#{attr_name}'); ")
-            self.class.read_methods << attr_name
-          end
-          
-          evaluate_read_method attr_name, "def #{symbol}; #{access_code}; end"
-        end
-        
-        def method_missing(method_id, *args, &block)
-          method_name = method_id.to_s
-          if @attributes.include?(method_name) or
-           (md = /\?$/.match(method_name) and
-            @attributes.include?(method_name = md.pre_match))
-            define_read_methods if self.class.read_methods.empty? && self.class.generate_read_methods
-            md ? query_attribute(method_name) : read_attribute(method_name)
-          elsif self.class.primary_keys.include? method_name.to_sym
-            get_attr(method_name.to_sym)
-          elsif md = /(=|_before_type_cast)$/.match(method_name)
-            attribute_name, method_type = md.pre_match, md.to_s
-            if @attributes.include?(attribute_name)
-              case method_type
-              when '='
-                write_attribute(attribute_name, args.first)
-              when '_before_type_cast'
-                read_attribute_before_type_cast(attribute_name)
-              end
-            else
-              super
-            end
-          else
-            super
-          end
-        end
         
         private
         # The xx_without_callbacks methods are overwritten as that is the end of the alias chain

data/lib/composite_primary_keys/calculations.rb

@@ -1,6 +1,11 @@
 module CompositePrimaryKeys
   module ActiveRecord
     module Calculations
+      def self.append_features(base)
+        super
+        base.send(:extend, ClassMethods)
+      end
+      
       module ClassMethods
         def construct_calculation_sql(operation, column_name, options) #:nodoc:
           operation = operation.to_s.downcase

data/lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,11 @@
+require 'active_record/connection_adapters/sqlite_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters #:nodoc:
+    class SQLite3Adapter < SQLiteAdapter # :nodoc:
+      def supports_count_distinct? #:nodoc:
+        false
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/migration.rb

@@ -10,4 +10,11 @@ ActiveRecord::ConnectionAdapters::ColumnDefinition.class_eval <<-'EOF'
   end
 EOF
 
-
+ActiveRecord::ConnectionAdapters::TableDefinition.class_eval <<-'EOF'
+  def [](name)
+    @columns.find { |column|
+      !column.name.is_a?(Array) && column.name.to_s == name.to_s
+    }
+  end
+EOF
+ 

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases.rake

@@ -1,3 +1,5 @@
+require 'active_record'
+
 # UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase
 for adapter in %w( mysql sqlite oracle postgresql ibm_db ) 
   Rake::TestTask.new("test_#{adapter}") { |t|

data/tasks/databases/oracle.rake

@@ -1,15 +1,25 @@
 namespace :oracle do
   desc 'Build the Oracle test databases'
-  task :build_databases do 
+  task :build_databases => :load_connection do 
     puts File.join(SCHEMA_PATH, 'oracle.sql')
-    sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
+    options_str = ENV['cpk_adapter_options_str']
+    sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
   end
 
   desc 'Drop the Oracle test databases'
-  task :drop_databases do 
-    sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
+  task :drop_databases => :load_connection do 
+    puts File.join(SCHEMA_PATH, 'oracle.drop.sql')
+    options_str = ENV['cpk_adapter_options_str']
+    sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
   end
 
   desc 'Rebuild the Oracle test databases'
   task :rebuild_databases => [:drop_databases, :build_databases]
+  
+  task :load_connection do
+    require File.join(PROJECT_ROOT, %w[lib adapter_helper oracle])
+    spec = AdapterHelper::Oracle.load_connection_from_env
+    ENV['cpk_adapter_options_str'] = "#{spec[:username]}/#{spec[:password]}@#{spec[:host]}"
+  end
+  
 end

data/test/abstract_unit.rb

@@ -18,12 +18,8 @@ QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Obj
 class Test::Unit::TestCase #:nodoc:
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
   self.use_instantiated_fixtures = false
-  self.use_transactional_fixtures = true #(ENV['AR_NO_TX_FIXTURES'] != "yes")
+  self.use_transactional_fixtures = true
 
-  def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names, {}, &block)
-  end
-  
   def assert_date_from_db(expected, actual, message = nil)
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted

data/test/connections/native_oracle/connection.rb

@@ -9,5 +9,6 @@ puts "Logging to #{log_path}/debug.log"
 ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
 
 # Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::MySQL.load_connection_from_env
+connection_options = AdapterHelper::Oracle.load_connection_from_env
+puts connection_options.inspect
 ActiveRecord::Base.establish_connection(connection_options)

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -90,3 +90,10 @@ CREATE TABLE membership_statuses (
   PRIMARY KEY (id)
 );
 
+create table kitchen_sinks (
+	id_1 integer not null,
+	id_2 integer not null,
+	a_date date,
+	a_string varchar(100),
+	primary key (id_1, id_2)
+);

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -11,3 +11,4 @@ drop table PRODUCTS;
 drop table USERS;                                                                                                                           
 drop table SUBURBS;                                                                                                                         
 drop table PRODUCT_TARIFFS; 
+drop table KITCHEN_SINK;

data/test/fixtures/db_definitions/mysql.sql

@@ -94,23 +94,31 @@ CREATE TABLE departments (
   department_id int(11) NOT NULL,
   location_id int(11) NOT NULL,
   PRIMARY KEY (department_id, location_id)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE employees (
  id int(11) NOT NULL auto_increment,
  department_id int(11) DEFAULT NULL,
  location_id int(11) DEFAULT NULL,
  PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE comments (
 	id int(11) NOT NULL auto_increment,
 	person_id varchar(100) DEFAULT NULL,
 	person_type varchar(100) DEFAULT NULL,
 	PRIMARY KEY (id)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE hacks (
  name varchar(50) NOT NULL,
  PRIMARY KEY (name)
-);
+) TYPE=InnoDB;
+
+create table kitchen_sinks (
+	id_1 int(11) not null,
+	id_2 int(11) not null,
+	a_date date,
+	a_string varchar(100),
+	primary key (id_1, id_2)
+) TYPE=InnoDB

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -24,4 +24,5 @@ drop table employees;
 drop sequence employees_seq;
 drop table comments;
 drop sequence comments_seq;
-drop table hacks;
+drop table hacks;
+drop table kitchen_sinks;

data/test/fixtures/db_definitions/oracle.sql

@@ -135,4 +135,12 @@ create sequence comments_seq
 
 CREATE TABLE hacks (
  name varchar(50) NOT NULL PRIMARY KEY
+);
+
+create table kitchen_sinks (
+	id_1 number(11) not null,
+	id_2 number(11) not null,
+	a_date date,
+	a_string varchar(100),
+	constraint kitchen_sinks_pk primary key(id_1, id_2)
 );

data/test/fixtures/db_definitions/postgresql.sql

@@ -121,4 +121,12 @@ CREATE TABLE comments (
 CREATE TABLE hacks (
  name varchar(50) NOT NULL,
  PRIMARY KEY (name)
+);
+
+create table kitchen_sinks (
+	id_1 int not null,
+	id_2 int not null,
+	a_date date,
+	a_string varchar(100),
+	primary key (id_1, id_2)
 );

data/test/fixtures/db_definitions/sqlite.sql

@@ -1,67 +1,67 @@
-CREATE TABLE `reference_types` (
-  `reference_type_id` INTEGER PRIMARY KEY,
-  `type_label` varchar(50) default NULL,
-  `abbreviation` varchar(50) default NULL,
-  `description` varchar(50) default NULL
+CREATE TABLE reference_types (
+  reference_type_id INTEGER PRIMARY KEY,
+  type_label varchar(50) default NULL,
+  abbreviation varchar(50) default NULL,
+  description varchar(50) default NULL
 );
 
-CREATE TABLE `reference_codes` (
-  `reference_type_id` int(11) NOT NULL,
-  `reference_code` int(11) NOT NULL,
-  `code_label` varchar(50) default NULL,
-  `abbreviation` varchar(50) default NULL,
-  `description` varchar(50) default NULL,
-  PRIMARY KEY  (`reference_type_id`,`reference_code`)
+CREATE TABLE reference_codes (
+  reference_type_id int(11) NOT NULL,
+  reference_code int(11) NOT NULL,
+  code_label varchar(50) default NULL,
+  abbreviation varchar(50) default NULL,
+  description varchar(50) default NULL,
+  PRIMARY KEY  (reference_type_id,reference_code)
 );
 
-CREATE TABLE `products` (
-  `id` int(11) NOT NULL PRIMARY KEY,
-  `name` varchar(50) default NULL
+CREATE TABLE products (
+  id int(11) NOT NULL PRIMARY KEY,
+  name varchar(50) default NULL
 );
 
-CREATE TABLE `tariffs` (
-  `tariff_id` int(11) NOT NULL,
-  `start_date` date NOT NULL,
-  `amount` integer(11) default NULL,
-  PRIMARY KEY  (`tariff_id`,`start_date`)
+CREATE TABLE tariffs (
+  tariff_id int(11) NOT NULL,
+  start_date date NOT NULL,
+  amount integer(11) default NULL,
+  PRIMARY KEY  (tariff_id,start_date)
 );
 
-CREATE TABLE `product_tariffs` (
-  `product_id` int(11) NOT NULL,
-  `tariff_id` int(11) NOT NULL,
-  `tariff_start_date` date NOT NULL,
-  PRIMARY KEY  (`product_id`,`tariff_id`,`tariff_start_date`)
+CREATE TABLE product_tariffs (
+  product_id int(11) NOT NULL,
+  tariff_id int(11) NOT NULL,
+  tariff_start_date date NOT NULL,
+  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
 );
 
-CREATE TABLE `suburbs` (
-  `city_id` int(11) NOT NULL,
-  `suburb_id` int(11) NOT NULL,
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY  (`city_id`,`suburb_id`)
+CREATE TABLE suburbs (
+  city_id int(11) NOT NULL,
+  suburb_id int(11) NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (city_id,suburb_id)
 );
 
-CREATE TABLE `streets` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `city_id` int(11) NOT NULL,
-  `suburb_id` int(11) NOT NULL,
-  `name` varchar(50) NOT NULL
+CREATE TABLE streets (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  city_id int(11) NOT NULL,
+  suburb_id int(11) NOT NULL,
+  name varchar(50) NOT NULL
 );
 
-CREATE TABLE `users` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `name` varchar(50) NOT NULL
+CREATE TABLE users (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  name varchar(50) NOT NULL
 );
 
-CREATE TABLE `articles` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `name` varchar(50) NOT NULL
+CREATE TABLE articles (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  name varchar(50) NOT NULL
 );
 
-CREATE TABLE `readings` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `user_id` int(11) NOT NULL,
-  `article_id` int(11) NOT NULL,
-  `rating` int(11) NOT NULL
+CREATE TABLE readings (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  user_id int(11) NOT NULL,
+  article_id int(11) NOT NULL,
+  rating int(11) NOT NULL
 );
 
 CREATE TABLE groups (
@@ -102,4 +102,12 @@ CREATE TABLE comments (
 
 CREATE TABLE hacks (
  name varchar(50) NOT NULL PRIMARY KEY
+);
+
+create table kitchen_sinks (
+	id_1 integer not null,
+	id_2 integer not null,
+	a_date date,
+	a_string varchar(100),
+	primary key (id_1, id_2)
 );