lib/initialization/initializers/orm_support.rb in mack-0.0.7.0 vs lib/initialization/initializers/orm_support.rb in mack-0.1.0
- old
+ new
@@ -2,22 +2,22 @@
[:activerecord, :data_mapper].each do |orm|
eval("def using_#{orm}?; false; end")
end
-unless app_config.mack.orm.nil?
+unless app_config.orm.nil?
dbs = YAML::load(ERB.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
- case app_config.mack.orm
+ case app_config.orm
when 'activerecord'
require 'activerecord'
ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
eval("def using_activerecord?; true; end")
when 'data_mapper'
require 'data_mapper'
DataMapper::Database.setup(dbs[MACK_ENV])
eval("def using_data_mapper?; true; end")
else
- MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.mack.orm}")
+ MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.orm}")
end
else
MACK_DEFAULT_LOGGER.warn("No ORM has been configured!")
end
\ No newline at end of file