composite_primary_keys 8.1.6 → 9.0.10

data/test/connections/connection_spec.rb

@@ -1,17 +1,26 @@
 require 'yaml'
+require 'erb'
 
 module CompositePrimaryKeys
   class ConnectionSpec
     def self.[](adapter)
-      config[adapter.to_s]
+      config[adapter.to_s].dup
     end
 
     private
 
     def self.config
       @config ||= begin
+        # Find the file location
         path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
-        YAML.load_file(path)
+
+        # Run any erb code
+        template = ERB.new(File.read(path))
+        project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+        data = template.result(binding)
+
+        # And now to YAML
+        YAML.load(data)
       end
     end
   end

data/test/connections/databases.ci.yml

@@ -4,12 +4,13 @@ mysql:
   password: ""
   database: composite_primary_keys_unittest
 
-sqlite3:
-  adapter: sqlite3
-  database: db/composite_primary_keys_unittest.sqlite
-
 postgresql:
   adapter: postgresql
   database: composite_primary_keys_unittest
   username: postgres
   host: localhost
+
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+

data/test/connections/databases.example.yml

@@ -2,14 +2,24 @@
 #  1. Copy this file to test/connections/databases.yml.
 #  2. Update to match the databases you want to test against.
 
+ibm_db:
+  database: ocdpdev
+  username: db2inst1
+  password: password
+  host: localhost
+
 mysql:
   adapter: mysql2
   username: root
+  password: mysql
   database: composite_primary_keys_unittest
 
-sqlite3:
-  adapter: sqlite3
-  database: db/composite_primary_keys_unittest.sqlite
+oracle:
+  adapter: oracle_enhanced
+  database: xe
+  username: SYSTEM
+  password: oracle
+  host: localhost
 
 postgresql:
   adapter: postgresql
@@ -17,9 +27,14 @@ postgresql:
   username: postgres
   host: localhost
 
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+
 sqlserver:
   adapter: sqlserver
+  username: cpk
+  password: cpk
   database: composite_primary_keys_unittest
-  username: rails
   host: localhost
   port: 1433

data/test/connections/databases.yml

@@ -1,30 +1,40 @@
-mysql:
-  adapter: mysql2
-  username: root
-  password: mysql
-  database: composite_primary_keys_unittest
-
-oracle:
-  adapter: oracle_enhanced
-  database: xe
-  username: SYSTEM
-  password: oracle
-  host: localhost
-
-postgresql:
-  adapter: postgresql
-  database: composite_primary_keys_unittest
-  username: postgres
-  host: localhost
-
-sqlite:
-  adapter: sqlite3
-  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
-
-sqlserver:
-  adapter: sqlserver
-  username: cpk
-  password: cpk
-  database: composite_primary_keys_unittest
-  host: localhost
-  port: 1433
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+ibm_db:
+  database: ocdpdev
+  username: db2inst1
+  password: password
+  host: localhost
+
+mysql:
+  adapter: mysql2
+  username: root
+  password: mysql
+  database: composite_primary_keys_unittest
+
+oracle:
+  adapter: oracle_enhanced
+  database: xe
+  username: SYSTEM
+  password: oracle
+  host: localhost
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  host: localhost
+
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+
+sqlserver:
+  adapter: sqlserver
+  username: cpk
+  password: cpk
+  database: composite_primary_keys_unittest
+  host: localhost
+  port: 1433

data/test/db_test.rb

@@ -1,53 +1,53 @@
-# assoc_test.rb
-
-path = File.expand_path(File.join(File.basename(__FILE__), "..", "lib", "composite_primary_keys"))
-puts path
-
-require File.join(path)
-require 'active_record'
-
-$configuration = {
-  :adapter  => 'postgresql',
-  :database => 'cpk_test',
-  :username => 'postgres'
-}
-
-ActiveRecord::Base.establish_connection($configuration) unless ActiveRecord::Base.connected?
-
-module GlobePG
-  class PGBase < ActiveRecord::Base
-    self.abstract_class = true
-   # establish_connection($configuration) unless connected?
-  end
-end
-
-module GlobePG
-  class TeacherToSchool < PGBase
-    set_table_name 'teacher_to_school'
-    self.primary_keys = ['teacherid', 'schoolid']
-
-    belongs_to :globe_teacher, :foreign_key => 'teacherid'
-    belongs_to :globe_school, :foreign_key => 'schoolid'
-  end
-end
-
-module GlobePG
-  class GlobeSchool < PGBase
-    set_table_name 'globe_school'
-    self.primary_key = 'schoolid'
-    has_many :teacher_to_schools, :foreign_key => :schoolid
-    has_many :globe_teachers, :through => :teacher_to_schools
-  end
-end
-
-module GlobePG
-  class GlobeTeacher < PGBase
-    set_table_name 'globe_teacher'
-    self.primary_key = 'teacherid'
-    has_many :teacher_to_schools, :foreign_key => :teacherid
-    has_many :globe_schools, :through => :teacher_to_schools
-  end
-end
-
-teacher = GlobePG::GlobeTeacher.find_by_teacherid('ZZGLOBEY')
+# assoc_test.rb
+
+path = File.expand_path(File.join(File.basename(__FILE__), "..", "lib", "composite_primary_keys"))
+puts path
+
+require File.join(path)
+require 'active_record'
+
+$configuration = {
+  :adapter  => 'postgresql',
+  :database => 'cpk_test',
+  :username => 'postgres'
+}
+
+ActiveRecord::Base.establish_connection($configuration) unless ActiveRecord::Base.connected?
+
+module GlobePG
+  class PGBase < ActiveRecord::Base
+    self.abstract_class = true
+   # establish_connection($configuration) unless connected?
+  end
+end
+
+module GlobePG
+  class TeacherToSchool < PGBase
+    set_table_name 'teacher_to_school'
+    self.primary_keys = ['teacherid', 'schoolid']
+
+    belongs_to :globe_teacher, :foreign_key => 'teacherid'
+    belongs_to :globe_school, :foreign_key => 'schoolid'
+  end
+end
+
+module GlobePG
+  class GlobeSchool < PGBase
+    set_table_name 'globe_school'
+    self.primary_key = 'schoolid'
+    has_many :teacher_to_schools, :foreign_key => :schoolid
+    has_many :globe_teachers, :through => :teacher_to_schools
+  end
+end
+
+module GlobePG
+  class GlobeTeacher < PGBase
+    set_table_name 'globe_teacher'
+    self.primary_key = 'teacherid'
+    has_many :teacher_to_schools, :foreign_key => :teacherid
+    has_many :globe_schools, :through => :teacher_to_schools
+  end
+end
+
+teacher = GlobePG::GlobeTeacher.find_by_teacherid('ZZGLOBEY')
 p teacher.globe_schools 

data/test/fixtures/article.rb

@@ -1,4 +1,5 @@
 class Article < ActiveRecord::Base
+  validates :id, uniqueness: true, numericality: true, allow_nil: true, allow_blank: true, on: :create
   has_many :readings, :dependent => :delete_all
   has_many :users, :through => :readings
 end

data/test/fixtures/articles.yml

@@ -1,7 +1,7 @@
-first:
-  id: 1
-  name: Article One
-  
-second:
-  id: 2
+first:
+  id: 1
+  name: Article One
+  
+second:
+  id: 2
   name: Article Two

data/test/fixtures/capitol.rb

@@ -1,3 +1,3 @@
-class Capitol < ActiveRecord::Base
-  self.primary_keys = :country, :city
-end
+class Capitol < ActiveRecord::Base
+  self.primary_keys = :country, :city
+end

data/test/fixtures/capitols.yml

@@ -1,16 +1,16 @@
-netherlands:
-  country: The Netherlands
-  city: Amsterdam
-
-france:
-  country: France
-  city: Paris
-
-canada:
-  country: Canada
-  city: Ottawa
-
-mexico:
-  country: Mexico
-  city: Mexico City
-  
+netherlands:
+  country: The Netherlands
+  city: Amsterdam
+
+france:
+  country: France
+  city: Paris
+
+canada:
+  country: Canada
+  city: Ottawa
+
+mexico:
+  country: Mexico
+  city: Mexico City
+  

data/test/fixtures/comments.yml

@@ -1,16 +1,16 @@
-comment1:
-  id: 1
-  person_id: 1
-  person_type: Employee
-  
-comment2:
-  id: 2
-  person_id: 1
-  person_type: User
-  hack_id: 7
-  
-comment3:
-  id: 3
-  person_id: 7
-  person_type: Hack
+comment1:
+  id: 1
+  person_id: 1
+  person_type: Employee
+  
+comment2:
+  id: 2
+  person_id: 1
+  person_type: User
+  hack_id: 7
+  
+comment3:
+  id: 3
+  person_id: 7
+  person_type: Hack
   

data/test/fixtures/db_definitions/mysql.sql

@@ -1,5 +1,5 @@
 create table topics (
-    id int not null auto_increment,  
+    id int not null auto_increment,
     name varchar(50) default null,  
     feed_size int default null, 
     primary key (id)
@@ -39,8 +39,8 @@ create table tariffs (
     tariff_id int not null,
     start_date date not null,
     amount integer(11) default null,
-    created_at timestamp,
-    updated_at timestamp,
+    created_at datetime,
+    updated_at datetime,
     primary key (tariff_id, start_date)
 );
 
@@ -116,7 +116,6 @@ create table employees (
     id int not null auto_increment,
     department_id int default null,
     location_id int default null,
-    name varchar(100) not null default 'anonymous',
     primary key (id)
 );
 
@@ -156,8 +155,8 @@ create table restaurants (
 create table restaurants_suburbs (
     franchise_id int not null,
     store_id int not null,
-    city_id int not null,
-    suburb_id int not null
+    city_id int default null,
+    suburb_id int default null
 );
 
 create table dorms (
@@ -202,15 +201,15 @@ create table seats (
 );
 
 create table capitols (
-  country varchar(100) default null,
-  city varchar(100) default null,
+  country varchar(100) not null,
+  city varchar(100) not null,
   primary key (country, city)
 );
 
 create table products_restaurants (
   product_id int not null,
-  franchise_id int not null,
-  store_id int not null
+  franchise_id int default null,
+  store_id int default null
 );
 
 create table employees_groups (
@@ -219,10 +218,10 @@ create table employees_groups (
 );
 
 create table pk_called_ids (
-    id serial not null,
-    reference_code    int         not null,
-    code_label        varchar(50) default null,
-    abbreviation      varchar(50) default null,
-    description       varchar(50) default null,
-    primary key (id, reference_code)
-);
+  id integer not null,
+  reference_code int not null,
+  code_label varchar(50) default null,
+  abbreviation varchar(50) default null,
+  description varchar(50) default null,
+  primary key (id, reference_code)
+);

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

@@ -46,3 +46,5 @@ drop table seats;
 drop table capitols;
 drop table products_restaurants;
 drop table employees_groups;
+drop table pk_called_ids;
+drop sequence pk_called_ids_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -16,24 +16,24 @@ create sequence reference_types_seq start with 1000;
 
 create table reference_types (
     reference_type_id number(11)   primary key,
-    type_label        varchar2(50) default null,
-    abbreviation      varchar2(50) default null,
-    description       varchar2(50) default null
+    type_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null
 );
 
 create table reference_codes (
     reference_type_id number(11),
     reference_code    number(11),
-    code_label        varchar2(50) default null,
-    abbreviation      varchar2(50) default null,
-    description       varchar2(50) default null
+    code_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null
 );
 
 create sequence products_seq start with 1000;
 
 create table products (
     id   number(11)   primary key,
-    name varchar2(50) default null
+    name varchar(50) default null
 );
 
 create table tariffs (
@@ -55,7 +55,7 @@ create table product_tariffs (
 create table suburbs (
     city_id   number(11),
     suburb_id number(11),
-    name      varchar2(50) not null,
+    name      varchar(50) not null,
     constraint suburbs_pk primary key (city_id, suburb_id)
 );
 
@@ -65,21 +65,21 @@ create table streets (
     id        number(11)   primary key,
     city_id   number(11)   not null,
     suburb_id number(11)   not null,
-    name      varchar2(50) not null
+    name      varchar(50) not null
 );
 
 create sequence users_seq start with 1000;
 
 create table users (
     id   number(11)   primary key,
-    name varchar2(50) not null
+    name varchar(50) not null
 );
 
 create sequence articles_seq start with 1000;
 
 create table articles (
     id   number(11)   primary key,
-    name varchar2(50) not null
+    name varchar(50) not null
 );
 
 create sequence readings_seq start with 1000;
@@ -95,7 +95,7 @@ create sequence groups_seq start with 1000;
 
 create table groups (
     id   number(11)   primary key,
-    name varchar2(50) not null
+    name varchar(50) not null
 );
 
 create table memberships (
@@ -110,7 +110,7 @@ create table membership_statuses (
     id       number(11)   primary key,
     user_id  number(11)   not null,
     group_id number(11)   not null,
-    status   varchar2(50) not null
+    status   varchar(50) not null
 );
 
 create table departments (
@@ -124,8 +124,7 @@ create sequence employees_seq start with 1000;
 create table employees (
     id            number(11) not null primary key,
     department_id number(11) default null,
-    location_id   number(11) default null,
-    name          varchar2(100) default 'anonymous'
+    location_id   number(11) default null
 );
 
 create sequence salaries_seq start with 1000;
@@ -219,8 +218,8 @@ create table seats (
 );
 
 create table capitols (
-    country varchar2(100) not null,
-    city varchar2(100) not null,
+    country varchar(100) not null,
+    city varchar(100) not null,
     primary key (country, city)
 );
 
@@ -235,3 +234,13 @@ create table employees_groups (
   group_id int not null
 );
 
+create sequence pk_called_ids_seq start with 1000;
+
+create table pk_called_ids (
+    id                int not null,
+    reference_code    int not null,
+    code_label        varchar(50) default null,
+    abbreviation      varchar(50) default null,
+    description       varchar(50) default null,
+    constraint pk_called_ids_pk primary key (id, reference_code)
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -41,9 +41,9 @@ create table tariffs (
     tariff_id  int  not null,
     start_date date not null,
     amount     int  default null,
-    primary key (tariff_id, start_date),
     created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    updated_at timestamp without time zone NOT NULL,
+    primary key (tariff_id, start_date)
 );
 
 create table product_tariffs (
@@ -118,7 +118,6 @@ create table employees (
     id            serial not null,
     department_id int default null,
     location_id   int default null,
-    name          text not null default 'anonymous',
     primary key (id)
 );
 

data/test/fixtures/db_definitions/sqlite.sql

@@ -109,7 +109,6 @@ create table departments (
 create table employees (
     id integer not null primary key autoincrement,
     department_id integer null,
-    name text not null default 'anonymous',
     location_id integer null
 );