lib/collation.rb @@ -14,20 +14,20 @@ class DatabsController < ApplicationController end def create - if (Datab.create(params[:datab]) rescue nil) - flash[:notice] = "Database #{params[:datab][:name]} was successfully created." - else - flash[:error] = 'Pas bon' - end + Datab.create! params[:datab] + flash[:notice] = "Database #{params[:datab][:name]} was successfully created." + rescue StandardError => e + flash[:notice] = e.to_s + ensure redirect_to databs_path end def destroy - if (Datab.destroy params[:id] rescue nil) - flash[:notice] = "Database #{params[:id]} was successfully deleted." - else - flash[:error] = 'Pas bon' - end + Datab.destroy! params[:id] + flash[:notice] = "Database #{params[:id]} was successfully deleted." + rescue StandardError => e + flash[:notice] = e.to_s + ensure redirect_to databs_path end app/controllers/databs_controller.rb @@ -1,12 +1,22 @@ class Datab < Base + include Collation + + attr_accessor :collation @@databs = {} - def self.create attributes - connection.create_database attributes[:name] + def self.create! attributes + options = {} + if !attributes[:collation].blank? + options[:collation] = attributes[:collation] + options[:charset] = Collations.detect do |group| + group.values.detect { |col| col.value == attributes[:collation] } + end.label + end + connection.create_database attributes[:name], options end - def self.destroy name + def self.destroy! name execute "drop database #{sanitize_table name}" @@databs.delete name end app/models/datab.rb @@ -6,7 +6,11 @@ <div class="field"> <%= f.label :name, 'Name' %> <%= f.text_field :name %> - <%= f.submit 'Create' %> + </div> + <div class="field"> + <%= f.label :collation, 'Collation' %> + <%= select_tag 'datab[collation]', option_groups_from_collection_for_select(Datab::Collations, "values or []", "title", "value", "title"), :id => 'datab_collation' %> + <%= f.submit 'Create' %> </div> <% end %> </div> app/views/databs/index.html.erb @@ -38,13 +38,22 @@ class DatabTest < ActiveSupport::TestCase should 'delete a database' do assert_difference 'Datab.all.size', -1 do - Datab.destroy 'rbdb_test1' + Datab.destroy! 'rbdb_test1' end end should 'delete a database named database' do assert_difference 'Datab.all.size', -1 do - Datab.destroy 'database' + Datab.destroy! 'database' + end + end + + should "set a collation" do + assert_difference 'Datab.all.size', 1 do + Datab.create! :name => 'rbdb_test_bulgar', :collation => 'cp1251_bulgarian_ci' + end + assert_difference 'Datab.all.size', -1 do + Datab.destroy! 'rbdb_test_bulgar' end end test/unit/datab_test.rb 2c38be78e271ec9cadbd9bfecf6b2b4085caf0d8 Sylvain Utard - redox sylvain.utard@gmail.com http://github.com/redox/rbdb/commit/46de50d7aafbcd0d2a04ef038dec397e117f4feb 46de50d7aafbcd0d2a04ef038dec397e117f4feb 2008-12-29T04:16:13-08:00 2008-12-29T04:16:13-08:00 * Add collation support 4425ef1fe4e8e6464531e90e71e28d6043266704 Sylvain Utard - redox sylvain.utard@gmail.com