composite_primary_keys 8.1.1 → 8.1.2

data/test/connections/native_oracle/connection.rb

@@ -1,11 +1,11 @@
-print "Using native Oracle\n"
-
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
-def connection_string
-  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
-end
-
-# Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec['oracle']
-ActiveRecord::Base.establish_connection(SPEC)
+print "Using native Oracle\n"
+
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+
+def connection_string
+  "#{SPEC['username']}/#{SPEC['password']}@//#{SPEC['host']}:#{SPEC['port']}/#{SPEC['database']}"
+end
+
+# Adapter config setup in locals/database_connections.rb
+SPEC = CompositePrimaryKeys::ConnectionSpec['oracle']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_oracle_enhanced/connection.rb

@@ -1,16 +1,16 @@
-print "Using native Oracle Enhanced\n"
-
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
-def connection_string
-  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
-end
-
-# Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec[:oracle]
-ActiveRecord::Base.establish_connection(SPEC)
-
-# Change default options for Oracle Enhanced adapter
-ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-# Change NLS_DATE_FORMAT to non-default format to verify that all tests should pass
-ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}
+print "Using native Oracle Enhanced\n"
+
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+
+def connection_string
+  "#{SPEC['username']}/#{SPEC['password']}@//#{SPEC['host']}:#{SPEC['port']}/#{SPEC['database']}"
+end
+
+# Adapter config setup in locals/database_connections.rb
+SPEC = CompositePrimaryKeys::ConnectionSpec[:oracle_enhanced]
+ActiveRecord::Base.establish_connection(SPEC)
+
+# Change default options for Oracle Enhanced adapter
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+# Change NLS_DATE_FORMAT to non-default format to verify that all tests should pass
+ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}

data/test/fixtures/comment.rb

@@ -1,7 +1,7 @@
-class Comment < ActiveRecord::Base
-  belongs_to :person, :polymorphic => true
-  belongs_to :hack
-
-  enum :shown => [ :true, :false ]
-end
-
+class Comment < ActiveRecord::Base
+  belongs_to :person, :polymorphic => true
+  belongs_to :hack
+
+  enum :shown => [ :true, :false ]
+end
+

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

@@ -1,126 +1,126 @@
-CREATE TABLE topics (
-  id integer NOT NULL,  
-  name varchar(50) default NULL,  
-  feed_size integer default NULL, 
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE topic_sources (
-  topic_id integer NOT NULL,
-  platform varchar(50) NOT NULL,
-  keywords varchar(50) default NULL,
-  PRIMARY KEY (topic_id,platform)
-);
-
-CREATE TABLE reference_types (
-  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
-  type_label varchar(50) default NULL,  
-  abbreviation varchar(50) default NULL, 
-  description varchar(50) default NULL, 
-  PRIMARY KEY (reference_type_id)
-);
-
-CREATE TABLE reference_codes (
-  reference_type_id integer,
-  reference_code integer 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 integer NOT NULL,
-  name varchar(50) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE tariffs (
-  tariff_id integer NOT NULL,
-  start_date date NOT NULL,
-  amount integer default NULL,
-  PRIMARY KEY  (tariff_id,start_date)
-);
-
-CREATE TABLE product_tariffs (
-  product_id integer NOT NULL,
-  tariff_id integer NOT NULL,
-  tariff_start_date date NOT NULL,
-  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
-);
-
-CREATE TABLE suburbs (
-  city_id integer NOT NULL,
-  suburb_id integer NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (city_id,suburb_id)
-);
-
-CREATE TABLE streets (
-  id integer NOT NULL ,
-  city_id integer NOT NULL,
-  suburb_id integer NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE users (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE articles (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE readings (
-  id integer NOT NULL ,
-  user_id integer NOT NULL,
-  article_id integer NOT NULL,
-  rating integer NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE groups (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);               
-
-CREATE TABLE memberships (
-  user_id integer NOT NULL,
-  group_id integer NOT NULL,
-  PRIMARY KEY  (user_id,group_id)
-);
-
-CREATE TABLE membership_statuses (
-  id integer NOT NULL ,
-  user_id integer NOT NULL,
-  group_id integer NOT NULL,
-  status varchar(50) NOT NULL,
-  PRIMARY KEY (id)
-);
-
-create table restaurants (
-	franchise_id integer not null,
-	store_id integer not null,
-	name varchar(100),
-  lock_version integer default 0,
-	primary key (franchise_id, store_id)
-);
-
-create table restaurants_suburbs (
-	franchise_id integer not null,
-	store_id integer not null,
-	city_id integer not null,
-	suburb_id integer not null
-);
-
-create table products_restaurants (
-  product_id integer not null,
-  franchise_id integer not null,
-  store_id integer not null
-);
+CREATE TABLE topics (
+  id integer NOT NULL,  
+  name varchar(50) default NULL,  
+  feed_size integer default NULL, 
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE topic_sources (
+  topic_id integer NOT NULL,
+  platform varchar(50) NOT NULL,
+  keywords varchar(50) default NULL,
+  PRIMARY KEY (topic_id,platform)
+);
+
+CREATE TABLE reference_types (
+  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
+  type_label varchar(50) default NULL,  
+  abbreviation varchar(50) default NULL, 
+  description varchar(50) default NULL, 
+  PRIMARY KEY (reference_type_id)
+);
+
+CREATE TABLE reference_codes (
+  reference_type_id integer,
+  reference_code integer 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 integer NOT NULL,
+  name varchar(50) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE tariffs (
+  tariff_id integer NOT NULL,
+  start_date date NOT NULL,
+  amount integer default NULL,
+  PRIMARY KEY  (tariff_id,start_date)
+);
+
+CREATE TABLE product_tariffs (
+  product_id integer NOT NULL,
+  tariff_id integer NOT NULL,
+  tariff_start_date date NOT NULL,
+  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
+);
+
+CREATE TABLE suburbs (
+  city_id integer NOT NULL,
+  suburb_id integer NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (city_id,suburb_id)
+);
+
+CREATE TABLE streets (
+  id integer NOT NULL ,
+  city_id integer NOT NULL,
+  suburb_id integer NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE users (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE articles (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE readings (
+  id integer NOT NULL ,
+  user_id integer NOT NULL,
+  article_id integer NOT NULL,
+  rating integer NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE groups (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);               
+
+CREATE TABLE memberships (
+  user_id integer NOT NULL,
+  group_id integer NOT NULL,
+  PRIMARY KEY  (user_id,group_id)
+);
+
+CREATE TABLE membership_statuses (
+  id integer NOT NULL ,
+  user_id integer NOT NULL,
+  group_id integer NOT NULL,
+  status varchar(50) NOT NULL,
+  PRIMARY KEY (id)
+);
+
+create table restaurants (
+	franchise_id integer not null,
+	store_id integer not null,
+	name varchar(100),
+  lock_version integer default 0,
+	primary key (franchise_id, store_id)
+);
+
+create table restaurants_suburbs (
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
+);
+
+create table products_restaurants (
+  product_id integer not null,
+  franchise_id integer not null,
+  store_id integer not null
+);

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

@@ -1,19 +1,19 @@
-drop table MEMBERSHIPS;                                                                                                                    
-drop table REFERENCE_CODES;                                                                                                                 
-drop table TARIFFS;                                                                                                                         
-drop table ARTICLES;                                                                                                                        
-drop table GROUPS;                                                                                                                          
-drop table MEMBERSHIP_STATUSES;                                                                                                             
-drop table READINGS;                                                                                                                        
-drop table REFERENCE_TYPES;                                                                                                                 
-drop table STREETS;                                                                                                                         
-drop table PRODUCTS;                                                                                                                        
-drop table USERS;                                                                                                                           
-drop table SUBURBS;                                                                                                                         
-drop table PRODUCT_TARIFFS; 
-drop table KITCHEN_SINK;
-drop table RESTAURANTS;
-drop table RESTAURANTS_SUBURBS;
-drop table PRODUCTS_RESTAURANTS;
-drop table TOPICS;
+drop table MEMBERSHIPS;                                                                                                                    
+drop table REFERENCE_CODES;                                                                                                                 
+drop table TARIFFS;                                                                                                                         
+drop table ARTICLES;                                                                                                                        
+drop table GROUPS;                                                                                                                          
+drop table MEMBERSHIP_STATUSES;                                                                                                             
+drop table READINGS;                                                                                                                        
+drop table REFERENCE_TYPES;                                                                                                                 
+drop table STREETS;                                                                                                                         
+drop table PRODUCTS;                                                                                                                        
+drop table USERS;                                                                                                                           
+drop table SUBURBS;                                                                                                                         
+drop table PRODUCT_TARIFFS; 
+drop table KITCHEN_SINK;
+drop table RESTAURANTS;
+drop table RESTAURANTS_SUBURBS;
+drop table PRODUCTS_RESTAURANTS;
+drop table TOPICS;
 drop table TOPIC_SOURCES;

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

@@ -1,45 +1,48 @@
-drop table topics;
-drop sequence topics_seq;
-drop table topic_sources;
-drop table reference_types;
-drop sequence reference_types_seq;
-drop table reference_codes;
-drop table products;
-drop sequence products_seq;
-drop table tariffs;
-drop table product_tariffs;
-drop table suburbs;
-drop table streets;
-drop sequence streets_seq;
-drop table users;
-drop sequence users_seq;
-drop table articles;
-drop sequence articles_seq;
-drop table readings;
-drop sequence readings_seq;
-drop table groups;
-drop sequence groups_seq;
-drop table memberships;
-drop table membership_statuses;
-drop sequence membership_statuses_seq;
-drop table departments;
-drop table employees;
-drop sequence employees_seq;
-drop table comments;
-drop sequence comments_seq;
-drop table hacks;
-drop sequence hacks_seq;
-drop table restaurants;
-drop table restaurants_suburbs;
-drop table dorms;
-drop sequence dorms_seq;
-drop table rooms;
-drop table room_attributes;
-drop sequence room_attributes_seq;
-drop table room_attribute_assignments;
-drop table room_assignments;
-drop table students;
-drop sequence students_seq;
-drop table seats;
-drop table capitols;
-drop table products_restaurants;
+drop table topics;
+drop sequence topics_seq;
+drop table topic_sources;
+drop table reference_types;
+drop sequence reference_types_seq;
+drop table reference_codes;
+drop table products;
+drop sequence products_seq;
+drop table tariffs;
+drop table product_tariffs;
+drop table suburbs;
+drop table streets;
+drop sequence streets_seq;
+drop table users;
+drop sequence users_seq;
+drop table articles;
+drop sequence articles_seq;
+drop table readings;
+drop sequence readings_seq;
+drop table groups;
+drop sequence groups_seq;
+drop table memberships;
+drop table membership_statuses;
+drop sequence membership_statuses_seq;
+drop table departments;
+drop table salaries;
+drop sequence salaries_seq;
+drop table employees;
+drop sequence employees_seq;
+drop table comments;
+drop sequence comments_seq;
+drop table hacks;
+drop sequence hacks_seq;
+drop table restaurants;
+drop table restaurants_suburbs;
+drop table dorms;
+drop sequence dorms_seq;
+drop table rooms;
+drop table room_attributes;
+drop sequence room_attributes_seq;
+drop table room_attribute_assignments;
+drop table room_assignments;
+drop table students;
+drop sequence students_seq;
+drop table seats;
+drop table capitols;
+drop table products_restaurants;
+drop table employees_groups;