diff --git a/Gemfile b/Gemfile index f878194..e85c85a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ gem 'rails', '3.1.0' # gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'sqlite3' +gem 'mysql2' +gem 'yaml_db' # Asset template engines gem 'sass-rails', "~> 3.1.0.rc" diff --git a/app/controllers/admin/prescriptions_controller.rb b/app/controllers/admin/prescriptions_controller.rb index 1ba8700..d37a5ab 100644 --- a/app/controllers/admin/prescriptions_controller.rb +++ b/app/controllers/admin/prescriptions_controller.rb @@ -81,7 +81,7 @@ class Admin::PrescriptionsController < ApplicationController end def find_prescriptions - @prescriptions = Prescription.order("read ASC, done ASC, created_at DESC") + @prescriptions = Prescription.order("'read ASC', 'done ASC', 'created_at DESC'") @last = Prescription.order("created_at DESC").first end diff --git a/config/database.yml b/config/database.yml index c2712be..320c740 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,7 +16,10 @@ test: timeout: 5000 production: - adapter: sqlite3 - database: db/production.sqlite3 + adapter: mysql2 + encoding: utf8 + database: boissier_app pool: 5 - timeout: 5000 + username: boissier_app + password: boissierprod + socket: /var/run/mysqld/mysqld.sock