Skip to content

Commit

Permalink
Made change to migrations that were crashing when running rake. Added…
Browse files Browse the repository at this point in the history
… exceptions on files that should not be tracked
  • Loading branch information
timmtonga committed Nov 12, 2015
1 parent b871184 commit 3b077b8
Show file tree
Hide file tree
Showing 16 changed files with 144 additions and 375 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@
/log/*
!/log/.keep
/tmp

# Ignore all configuration files

*.yml
.idea/*
.ruby-version
*.lock
*.schema.rb
*~
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'rails', '4.2.0'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', github: 'rails/sass-rails'
#gem 'sass-rails', github: 'rails/sass-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 2.5.3'
# Use CoffeeScript for .coffee assets and views
Expand Down Expand Up @@ -58,6 +58,7 @@ gem 'rghost_barcode'

gem 'paloma'

gem 'mysql'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand All @@ -81,6 +82,6 @@ group :development, :test do
end

group :production do
gem 'pg', '0.17.1'
#gem 'pg', '0.17.1'
gem 'rails_12factor', '0.0.2'
end
end
239 changes: 0 additions & 239 deletions Gemfile.lock

This file was deleted.

25 changes: 0 additions & 25 deletions config/database.yml

This file was deleted.

4 changes: 2 additions & 2 deletions db/migrate/20150211063924_create_dispensed_med_patients.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreateDispensedMedPatients < ActiveRecord::Migration
def change
create_table :dispensed_med_patients do |t|
t.patient_id :integer
t.dispensed_med_id :integer
t.integer :patient_id
t.integer :dispensed_med_id

t.timestamps null: false
end
Expand Down
4 changes: 2 additions & 2 deletions db/migrate/20150211071322_create_dispensed_med_inventories.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreateDispensedMedInventories < ActiveRecord::Migration
def change
create_table :dispensed_med_inventories do |t|
t.inventory_id :integer
t.dispensed_med_id :integer
t.integer :inventory_id
t.integer :dispensed_med_id

t.timestamps null: false
end
Expand Down
4 changes: 2 additions & 2 deletions db/migrate/20150211072747_create_prescription_providers.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreatePrescriptionProviders < ActiveRecord::Migration
def change
create_table :prescription_providers do |t|
t.prescription_id :integer
t.provider_id :integer
t.integer :prescription_id
t.integer :provider_id

t.timestamps null: false
end
Expand Down
4 changes: 2 additions & 2 deletions db/migrate/20150211072806_create_prescription_patients.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreatePrescriptionPatients < ActiveRecord::Migration
def change
create_table :prescription_patients do |t|
t.prescription_id :integer
t.patient_id :integer
t.integer :prescription_id
t.integer :patient_id

t.timestamps null: false
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreatePrescriptionMedicationsRxNorms < ActiveRecord::Migration
def change
create_table :prescription_medications_rx_norms do |t|
t.prescription_id :integer
t.medication_id :integer
t.integer :prescription_id
t.integer :medication_id

t.timestamps null: false
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreateInventoryMedicationsRxNorms < ActiveRecord::Migration
def change
create_table :inventory_medications_rx_norms do |t|
t.inventory_id :integer
t.medication_id :integer
t.integer :inventory_id
t.integer :medication_id

t.timestamps null: false
end
Expand Down
4 changes: 2 additions & 2 deletions db/migrate/20150211072917_create_application_patients.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreateApplicationPatients < ActiveRecord::Migration
def change
create_table :application_patients do |t|
t.application_id :integer
t.patient_id :integer
t.integer :application_id
t.integer :patient_id

t.timestamps null: false
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CreateApplicationMedicationsRxNorms < ActiveRecord::Migration
def change
create_table :application_medications_rx_norms do |t|
t.application_id :integer
t.medication_id :integer
t.integer :application_id
t.integer :medication_id

t.timestamps null: false
end
Expand Down
Loading

0 comments on commit 3b077b8

Please sign in to comment.