Changeset 1247
- Timestamp:
- 01/09/08 18:58:07 (11 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/merb_activerecord/lib/merb/orms/active_record/connection.rb
r1245 r1247 20 20 full_config = Erubis.load_yaml_file(config_file) 21 21 config = (Merb::Plugins.config[:merb_active_record] = {}) 22 (full_config[Merb.environment _ENV.to_sym] || full_config[Merb.environment_ENV]).each { |k, v| config[k.to_sym] = v }22 (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each { |k, v| config[k.to_sym] = v } 23 23 ::ActiveRecord::Base.configurations= full_config 24 24 config plugins/merb_activerecord/lib/merb/orms/active_record/tasks/databases.rb
r1241 r1247 1 1 task :environment do 2 Merb.environment _ENV = ( ENV['Merb.environment_ENV'] || Merb.environment_ENV).to_sym2 Merb.environment = ( ENV['Merb.environment'] || Merb.environment ).to_sym 3 3 end 4 4 … … 13 13 end 14 14 15 desc 'Create the local database defined in config/database.yml for the current Merb.environment _ENV'15 desc 'Create the local database defined in config/database.yml for the current Merb.environment' 16 16 task :create => :environment do 17 create_local_database(ActiveRecord::Base.configurations[Merb.environment _ENV])17 create_local_database(ActiveRecord::Base.configurations[Merb.environment]) 18 18 end 19 19 … … 54 54 desc 'Drops the database for the current environment' 55 55 task :drop => :environment do 56 config = ActiveRecord::Base.configurations[Merb.environment _ENV|| :development]56 config = ActiveRecord::Base.configurations[Merb.environment || :development] 57 57 p config 58 58 case config[:adapter] … … 77 77 # desc "Retrieves the charset for the current environment's database" 78 78 # task :charset => :environment do 79 # config = ActiveRecord::Base.configurations[Merb.environment _ENV|| :development]79 # config = ActiveRecord::Base.configurations[Merb.environment || :development] 80 80 # case config[:adapter] 81 81 # when 'mysql' … … 89 89 # desc "Retrieves the collation for the current environment's database" 90 90 # task :collation => :environment do 91 # config = ActiveRecord::Base.configurations[Merb.environment _ENV|| :development]91 # config = ActiveRecord::Base.configurations[Merb.environment || :development] 92 92 # case config[:adapter] 93 93 # when 'mysql' … … 108 108 task :load => :environment do 109 109 require 'active_record/fixtures' 110 ActiveRecord::Base.establish_connection(Merb.environment _ENV.to_sym)110 ActiveRecord::Base.establish_connection(Merb.environment.to_sym) 111 111 (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Merb.root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| 112 112 Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) … … 134 134 desc "Dump the database structure to a SQL file" 135 135 task :dump do 136 config = ActiveRecord::Base.configurations[Merb.environment _ENV.to_sym]136 config = ActiveRecord::Base.configurations[Merb.environment.to_sym] 137 137 case config[:adapter] 138 138 when "mysql", "oci", "oracle" 139 ActiveRecord::Base.establish_connection(config[Merb.environment _ENV])140 File.open("schema/#{Merb.environment _ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }139 ActiveRecord::Base.establish_connection(config[Merb.environment]) 140 File.open("schema/#{Merb.environment}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump } 141 141 when "postgresql" 142 142 ENV['PGHOST'] = config[:host] if config[:host] … … 145 145 search_path = config[:schema_search_path] 146 146 search_path = "--schema=#{search_path}" if search_path 147 `pg_dump -i -U "#{config[:username]}" -s -x -O -f schema/#{Merb.environment _ENV}_structure.sql #{search_path} #{config[:database]}`147 `pg_dump -i -U "#{config[:username]}" -s -x -O -f schema/#{Merb.environment}_structure.sql #{search_path} #{config[:database]}` 148 148 raise "Error dumping database" if $?.exitstatus == 1 149 149 when "sqlite", "sqlite3" 150 150 dbfile = config[:database] || config[:dbfile] 151 `#{config[:adapter]} #{dbfile} .schema > schema/#{Merb.environment _ENV}_structure.sql`151 `#{config[:adapter]} #{dbfile} .schema > schema/#{Merb.environment}_structure.sql` 152 152 when "sqlserver" 153 `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f schema\\#{Merb.environment _ENV}_structure.sql /q /A /r`153 `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f schema\\#{Merb.environment}_structure.sql /q /A /r` 154 154 `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F schema\ /q /A /r` 155 155 when "firebird" 156 set_firebird_env(config[Merb.environment _ENV])157 db_string = firebird_db_string(config[Merb.environment _ENV])158 sh "isql -a #{db_string} > schema/#{Merb.environment _ENV}_structure.sql"156 set_firebird_env(config[Merb.environment]) 157 db_string = firebird_db_string(config[Merb.environment]) 158 sh "isql -a #{db_string} > schema/#{Merb.environment}_structure.sql" 159 159 else 160 160 raise "Task not supported by '#{config[:adapter]}'" … … 162 162 163 163 if ActiveRecord::Base.connection.supports_migrations? 164 File.open("schema/#{Merb.environment _ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }164 File.open("schema/#{Merb.environment}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information } 165 165 end 166 166 end … … 182 182 ActiveRecord::Base.establish_connection(:test) 183 183 ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') 184 IO.readlines("schema/#{Merb.environment _ENV}_structure.sql").join.split("\n\n").each do |table|184 IO.readlines("schema/#{Merb.environment}_structure.sql").join.split("\n\n").each do |table| 185 185 ActiveRecord::Base.connection.execute(table) 186 186 end … … 189 189 ENV['PGPORT'] = config[:port].to_s if config[:port] 190 190 ENV['PGPASSWORD'] = config[:password].to_s if config[:password] 191 `psql -U "#{config[:username]}" -f schema/#{Merb.environment _ENV}_structure.sql #{config[:database]}`191 `psql -U "#{config[:username]}" -f schema/#{Merb.environment}_structure.sql #{config[:database]}` 192 192 when "sqlite", "sqlite3" 193 193 dbfile = config[:database] ||config[:dbfile] 194 `#{config[:adapter]} #{dbfile} < schema/#{Merb.environment _ENV}_structure.sql`194 `#{config[:adapter]} #{dbfile} < schema/#{Merb.environment}_structure.sql` 195 195 when "sqlserver" 196 `osql -E -S #{config[:host]} -d #{config[:database]} -i schema\\#{Merb.environment _ENV}_structure.sql`196 `osql -E -S #{config[:host]} -d #{config[:database]} -i schema\\#{Merb.environment}_structure.sql` 197 197 when "oci", "oracle" 198 198 ActiveRecord::Base.establish_connection(:test) 199 IO.readlines("schema/#{Merb.environment _ENV}_structure.sql").join.split(";\n\n").each do |ddl|199 IO.readlines("schema/#{Merb.environment}_structure.sql").join.split(";\n\n").each do |ddl| 200 200 ActiveRecord::Base.connection.execute(ddl) 201 201 end … … 203 203 set_firebird_env(config) 204 204 db_string = firebird_db_string(config) 205 sh "isql -i schema/#{Merb.environment _ENV}_structure.sql #{db_string}"205 sh "isql -i schema/#{Merb.environment}_structure.sql #{db_string}" 206 206 else 207 207 raise "Task not supported by '#{config[:adapter]}'"
