From 521d2dc72f725d311a32277774c56a40933e98a2 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Mon, 17 Mar 2014 17:41:31 +0530 Subject: [PATCH] Unnecessary migration and invalid syntax in migraton --- Gemfile | 2 +- Gemfile.lock | 2 -- .../20130515125823_change_attachment_default.rb | 4 ++-- .../20130515131210_drop_additional_speakers.rb | 9 --------- db/schema.rb | 16 ++++++++-------- 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 db/migrate/20130515131210_drop_additional_speakers.rb diff --git a/Gemfile b/Gemfile index 4df6a25f..d8373945 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ end group :development, :test do gem 'pry' - gem 'sqlite3' + gem 'mysql2' gem 'thin' gem 'rspec-rails', '2.11.0' end diff --git a/Gemfile.lock b/Gemfile.lock index d4ac419f..ac0dd53c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,6 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.8) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref @@ -246,7 +245,6 @@ DEPENDENCIES rails (= 3.2.15) rspec-rails (= 2.11.0) sass-rails (~> 3.2.3) - sqlite3 therubyracer thin transitions diff --git a/db/migrate/20130515125823_change_attachment_default.rb b/db/migrate/20130515125823_change_attachment_default.rb index 562f76b4..bf1a4f88 100644 --- a/db/migrate/20130515125823_change_attachment_default.rb +++ b/db/migrate/20130515125823_change_attachment_default.rb @@ -1,8 +1,8 @@ class ChangeAttachmentDefault < ActiveRecord::Migration def up - change_column_default(:event_attachments, :public, :default => true) + change_column_default(:event_attachments, :public, true) end def down - change_column_default(:event_attachments, :public, :default => nil) + change_column_default(:event_attachments, :public, true) end end diff --git a/db/migrate/20130515131210_drop_additional_speakers.rb b/db/migrate/20130515131210_drop_additional_speakers.rb deleted file mode 100644 index a6332cd3..00000000 --- a/db/migrate/20130515131210_drop_additional_speakers.rb +++ /dev/null @@ -1,9 +0,0 @@ -class DropAdditionalSpeakers < ActiveRecord::Migration - def up - remove_column :registrations, :additional_speakers - end - - def down - add_column :registrations, :additional_speakers - end -end diff --git a/db/schema.rb b/db/schema.rb index 0632d711..119381f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -118,14 +118,14 @@ ActiveRecord::Schema.define(:version => 20140305102505) do create_table "event_attachments", :force => true do |t| t.integer "event_id" - t.string "title", :null => false + t.string "title", :null => false t.string "attachment_file_name" t.string "attachment_content_type" t.integer "attachment_file_size" t.datetime "attachment_updated_at" - t.boolean "public", :default => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.boolean "public", :default => true + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "event_people", :force => true do |t| @@ -347,14 +347,14 @@ ActiveRecord::Schema.define(:version => 20140305102505) do create_table "venues", :force => true do |t| t.string "guid" - t.text "name", :limit => 255 - t.text "address", :limit => 255 + t.text "name" + t.text "address" t.string "website" t.text "description" t.string "offline_map_url" t.string "offline_map_bounds" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "versions", :force => true do |t|