composite_primary_keys 1.0.8 → 1.0.10

data/lib/composite_primary_keys/composite_arrays.rb

@@ -1,21 +1,22 @@
 module CompositePrimaryKeys
-  ID_SEP = ','
+  ID_SEP     = ','
   ID_SET_SEP = ';'
+
   module ArrayExtension
     def to_composite_keys
       CompositeKeys.new(self)
     end
-    
+
     def to_composite_ids
       CompositeIds.new(self)
     end
   end
-  
+
   class CompositeArray < Array
     def to_s
       join(ID_SEP)
     end
-  end  
+  end
 
   class CompositeKeys < CompositeArray
 
@@ -26,4 +27,4 @@ module CompositePrimaryKeys
   end
 end
 
-Array.send(:include, CompositePrimaryKeys::ArrayExtension)
+Array.send(:include, CompositePrimaryKeys::ArrayExtension)

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -4,8 +4,50 @@ module ActiveRecord
       
       # This mightn't be in Core, but count(distinct x,y) doesn't work for me
       def supports_count_distinct? #:nodoc:
-        true
+        false
+      end
+
+      def concat(*columns)
+        columns = columns.map { |c| "CAST(#{c} AS varchar)" }
+        "(#{columns.join('||')})"
+      end
+      
+      # Executes an INSERT query and returns the new record's ID
+      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+        # Extract the table from the insert sql. Yuck.
+        table = sql.split(" ", 4)[2].gsub('"', '')
+
+        # Try an insert with 'returning id' if available (PG >= 8.2)
+        if supports_insert_with_returning?
+          pk, sequence_name = *pk_and_sequence_for(table) unless pk
+          if pk
+            quoted_pk = if pk.is_a?(Array)
+                          pk.map { |col| quote_column_name(col) }.join(ID_SEP)
+                        else
+                          quote_column_name(pk)
+                        end
+            id = select_value("#{sql} RETURNING #{quoted_pk}")
+            clear_query_cache
+            return id
+          end
+        end
+
+        # Otherwise, insert then grab last_insert_id.
+        if insert_id = super
+          insert_id
+        else
+          # If neither pk nor sequence name is given, look them up.
+          unless pk || sequence_name
+            pk, sequence_name = *pk_and_sequence_for(table)
+          end
+
+          # If a pk is given, fallback to default sequence name.
+          # Don't fetch last insert id for a table without a pk.
+          if pk && sequence_name ||= default_sequence_name(table, pk)
+            last_insert_id(table, sequence_name)
+          end
+        end
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/fixtures.rb

@@ -1,9 +1,8 @@
 class Fixture #:nodoc:
   def [](key)
     if key.is_a? Array
-      return key.map {|a_key| self[a_key.to_s]}.
-        to_composite_ids.to_s
+      return key.map { |a_key| self[a_key.to_s] }.to_composite_ids.to_s
     end
     @fixture[key]
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/scripts/console.rb

@@ -1,18 +1,39 @@
-# FIXME:
-# I haven't figured out how to setup an irb console yet.
-# So, from the root, run:
-# irb -f -r scripts/console
+#!/usr/bin/env ruby
 
-PROJECT_ROOT = '.' #File.join(File.dirname(__FILE__), '..')
+#
+# 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
 
-adapter = 'mysql'
-$:.unshift 'lib'
+#
+# load all necessary libraries
+#
+require 'rubygems'
+require 'local/database_connections'
+
+$LOAD_PATH.unshift 'lib'
 
-require "local/database_connections"
 begin
-  require "local/paths" 
-  $:.unshift "#{ENV['EDGE_RAILS_DIR']}/activerecord/lib" if ENV['EDGE_RAILS_DIR']
-  $:.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
+  require 'local/paths'
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activerecord/lib"  if ENV['EDGE_RAILS_DIR']
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
 rescue
 end
 
@@ -22,4 +43,6 @@ 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/test/fixtures/db_definitions/db2-create-tables.sql

@@ -7,7 +7,7 @@ CREATE TABLE reference_types (
 );
 
 CREATE TABLE reference_codes (
-  reference_type_id integer NOT NULL,
+  reference_type_id integer,
   reference_code integer NOT NULL,
   code_label varchar(50) default NULL,
   abbreviation varchar(50) default NULL,
@@ -110,4 +110,4 @@ create table restaurants_suburbs (
 	store_id integer not null,
 	city_id integer not null,
 	suburb_id integer not null
-);
+);

data/test/fixtures/db_definitions/mysql.sql

@@ -1,173 +1,174 @@
-CREATE TABLE `reference_types` (
-  `reference_type_id` int(11) NOT NULL auto_increment,
-  `type_label` varchar(50) default NULL,
-  `abbreviation` varchar(50) default NULL,
-  `description` varchar(50) default NULL,
-  PRIMARY KEY  (`reference_type_id`)
-) TYPE=InnoDB;
-
-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`)
-) TYPE=InnoDB;
-
-CREATE TABLE `products` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) default NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
-
-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`)
-) TYPE=InnoDB;
-
-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`)
-) TYPE=InnoDB;
-
-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`)
-) TYPE=InnoDB;
-
-CREATE TABLE `streets` (
-  `id` int(11) NOT NULL auto_increment,
-  `city_id` int(11) NOT NULL,
-  `suburb_id` int(11) NOT NULL,
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
-
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
-
-CREATE TABLE `articles` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
-
-CREATE TABLE `readings` (
-  `id` int(11) NOT NULL auto_increment,
-  `user_id` int(11) NOT NULL,
-  `article_id` int(11) NOT NULL,
-  `rating` int(11) NOT NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
-
-CREATE TABLE groups (
-  id int(11) NOT NULL auto_increment,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-) TYPE=InnoDB;
-
-CREATE TABLE memberships (
-  user_id int(11) NOT NULL,
-  group_id int(11) NOT NULL,
-  PRIMARY KEY  (user_id,group_id)
-) TYPE=InnoDB;
-
-CREATE TABLE membership_statuses (
-  id int(11) NOT NULL auto_increment,
-  user_id int(11) NOT NULL,
-  group_id int(11) NOT NULL,
-  status varchar(50) NOT NULL,
-  PRIMARY KEY (id)
-) TYPE=InnoDB;
-
-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,
-	hack_id varchar(100) DEFAULT NULL,
-	PRIMARY KEY (id)
-) TYPE=InnoDB;
-
-CREATE TABLE hacks (
- name varchar(50) NOT NULL,
- PRIMARY KEY (name)
-) TYPE=InnoDB;
+create table reference_types (
+    reference_type_id int(11) not null auto_increment,
+    type_label varchar(50) default null,
+    abbreviation varchar(50) default null,
+    description varchar(50) default null,
+    primary key (reference_type_id)
+) type=InnoDB;
+
+create table reference_codes (
+    reference_type_id int(11),
+    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)
+) type=InnoDB;
+
+create table products (
+    id int(11) not null auto_increment,
+    name varchar(50) default null,
+    primary key (id)
+) type=InnoDB;
+
+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)
+) type=InnoDB;
+
+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)
+) type=InnoDB;
+
+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)
+) type=InnoDB;
+
+create table streets (
+    id int(11) not null auto_increment,
+    city_id int(11) not null,
+    suburb_id int(11) not null,
+    name varchar(50) not null,
+    primary key (id)
+) type=InnoDB;
+
+create table users (
+    id int(11) not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+) type=InnoDB;
+
+create table articles (
+    id int(11) not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+) type=InnoDB;
+
+create table readings (
+    id int(11) not null auto_increment,
+    user_id int(11) not null,
+    article_id int(11) not null,
+    rating int(11) not null,
+    primary key (id)
+) type=InnoDB;
+
+create table groups (
+    id int(11) not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+) type=InnoDB;
+
+create table memberships (
+    user_id int(11) not null,
+    group_id int(11) not null,
+    primary key  (user_id,group_id)
+) type=InnoDB;
+
+create table membership_statuses (
+    id int(11) not null auto_increment,
+    user_id int(11) not null,
+    group_id int(11) not null,
+    status varchar(50) not null,
+    primary key (id)
+) type=InnoDB;
+
+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,
+    hack_id 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;
+    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;
 
 create table restaurants (
-	franchise_id int(11) not null,
-	store_id int(11) not null,
-	name varchar(100),
-	primary key (franchise_id, store_id)
-) TYPE=InnoDB;
+    franchise_id int(11) not null,
+    store_id int(11) not null,
+    name varchar(100),
+    primary key (franchise_id, store_id)
+) type=InnoDB;
 
 create table restaurants_suburbs (
-	franchise_id int(11) not null,
-	store_id int(11) not null,
-	city_id int(11) not null,
-	suburb_id int(11) not null
-) TYPE=InnoDB;
+    franchise_id int(11) not null,
+    store_id int(11) not null,
+    city_id int(11) not null,
+    suburb_id int(11) not null
+) type=InnoDB;
 
 create table dorms (
-	id int(11) not null auto_increment,
-	primary key(id)
-) TYPE=InnoDB;
+    id int(11) not null auto_increment,
+    primary key(id)
+) type=InnoDB;
 
 create table rooms (
-	dorm_id int(11) not null,
-	room_id int(11) not null,
-	primary key (dorm_id, room_id)
-) TYPE=InnoDB;
+    dorm_id int(11) not null,
+    room_id int(11) not null,
+    primary key (dorm_id, room_id)
+) type=InnoDB;
 
 create table room_attributes (
-	id int(11) not null auto_increment,
-	name varchar(50),
-	primary key(id)
-) TYPE=InnoDB;
+    id int(11) not null auto_increment,
+    name varchar(50),
+    primary key(id)
+) type=InnoDB;
 
 create table room_attribute_assignments (
-	dorm_id int(11) not null,
-	room_id int(11) not null,
-	room_attribute_id int(11) not null
-) TYPE=InnoDB;
+    dorm_id int(11) not null,
+    room_id int(11) not null,
+    room_attribute_id int(11) not null
+) type=InnoDB;
 
 create table students (
-	id int(11) not null auto_increment,
-	primary key(id)
-) TYPE=InnoDB;
+    id int(11) not null auto_increment,
+    primary key(id)
+) type=InnoDB;
 
 create table room_assignments (
-	student_id int(11) not null,
-	dorm_id int(11) not null,
-	room_id int(11) not null	
-) TYPE=InnoDB;
+    student_id int(11) not null,
+    dorm_id int(11) not null,
+    room_id int(11) not null
+) type=InnoDB;
+