load_error_test.rb @@ -3,6 +3,7 @@ class AccountsController < ApplicationController skip_before_filter :authenticate, :only => [:login, :index] skip_before_filter :fill_last_queries skip_before_filter :fill_system_stats + skip_before_filter :establish_connection, :only => :login def index end @@ -33,7 +34,7 @@ class AccountsController < ApplicationController :database => '' ) ActiveRecord::Base.connection.execute "show databases" - rescue Mysql::Error + rescue flash[:error] = ($!).to_s return false end app/controllers/accounts_controller.rb @@ -21,13 +21,12 @@ class ApplicationController < ActionController::Base before_filter :fill_last_tables before_filter :fill_system_stats -# around_filter :rescue_connexion + # around_filter :rescue_connexion protected def authenticate return true if logged_in? - session[:return_to] = request.request_uri flash[:error] = 'Please give your credentials' redirect_to :controller => '/accounts', :action => :login app/controllers/application.rb @@ -13,15 +13,15 @@ class Table < Base end def ar_class - mod = db_module + mod = db_module model_name = name.singularize.camelize - c = mod.const_get model_name - rescue + c = "#{mod}::#{model_name}".constantize + rescue NameError c = Class.new ActiveRecord::Base c = mod.const_set model_name, c c.set_table_name name ensure - return c + return c end def columns @@ -78,6 +78,9 @@ class Table < Base mod = db_camelized.constantize rescue NameError mod = Module.new + def mod.const_missing name = nil + raise NameError + end Object.const_set db_camelized, mod ensure db_camelized.constantize app/models/table.rb @@ -1,6 +1,8 @@ # Monkey patch to avoid establishing a connection on application startup module Rails class Initializer - def initialize_database ; end + alias :initialize_database_original :initialize_database + def initialize_database + end end end \ No newline at end of file lib/rails_ar_initializer.rb @@ -1,6 +1,23 @@ require File.dirname(__FILE__) + '/../test_helper' class TablesControllerTest < ActionController::TestCase + + def setup + @request.session[:username] = 'root' + create_database 'rbdb_test1' do |datab| + datab.create_table 'databs' do end + datab.create_table 'TABLES' do end + end + end + + should 'handle table names matching our file names' do + get :show, :id => 'databs', :datab_id => 'rbdb_test1' + assert_response :success + end + should 'handle the information_schema db' do + get :show, :id => 'TABLES', :datab_id => 'rbdb_test1' + assert_response :success + end end test/functional/tables_controller_test.rb @@ -9,9 +9,11 @@ class ConnectionsTest < ActionController::IntegrationTest :password => conf[:password] valid_user.assert_response :redirect valid_user.assert_redirected_to '/databs' + valid_user.get '/databs' + valid_user.assert_response :success fake_user = open_session fake_user.post '/accounts/login', :username => 'phony', :password => 'so fake' - fake_user.assert_response :success + fake_user.assert_response :success valid_user.get '/databs' valid_user.assert_response :success end test/integration/connections_test.rb @@ -40,11 +40,22 @@ class Test::Unit::TestCase # Add more helper methods to be used by all tests here... config = YAML.load_file(File.join(Rails.root, 'config', 'database.yml'))[RAILS_ENV] ActiveRecord::Base.establish_connection( - :adapter => "mysql", - :host => "localhost", - :username => config['user'], - :password => config['password'], - :database => config['database'] + :adapter => "mysql", + :host => "localhost", + :username => config['user'], + :password => config['password'], + :database => config['database'] ) + def create_database datab + ActiveRecord::Base.connection.execute "drop database if exists #{datab}" + ActiveRecord::Base.connection.create_database datab + return unless block_given? + ActiveRecord::Base.connection.execute "use #{datab}" + yield ActiveRecord::Base.connection + end + + # We're not using the fixtures. Connection may be broken so let's skip this + def teardown_fixtures ; end + end test/test_helper.rb @@ -1,14 +1,11 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class DatabTest < ActiveSupport::TestCase - setup do - ActiveRecord::Base.connection.execute "drop database rbdb_test1" rescue nil - Datab.create :name => 'rbdb_test1' - ActiveRecord::Base.connection.execute "drop database rbdb_test2" rescue nil - Datab.create :name => 'rbdb_test2' - ActiveRecord::Base.connection.execute "drop database rbdb_test3" rescue nil - Datab.create :name => 'rbdb_test3' + def setup + create_database 'rbdb_test1' + create_database 'rbdb_test2' + create_database 'rbdb_test3' ActiveRecord::Base.connection.execute "use rbdb_test3" ActiveRecord::Base.connection.create_table 'table1' do |t| t.integer :field1 test/unit/datab_test.rb e6d807f244834720ed1d83ec55d5497245bde460 Ivan Schneider isc@massivebraingames.com http://github.com/redox/rbdb/commit/94076fcc3fe60cbe186b4b340c9ca7d1104c7943 94076fcc3fe60cbe186b4b340c9ca7d1104c7943 2008-11-11T11:01:16-08:00 2008-11-11T11:01:16-08:00 all the NameError and LoadError snafus in Table.ar_class should be fixed now 995211c809057bb8aa4219fcbcffe803ab92d32a Ivan Schneider isc@massivebraingames.com