diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/rails.rb | 16 | ||||
| -rw-r--r-- | lib/puppet/rails/database/01_puppet_initialize.rb (renamed from lib/puppet/rails/database.rb) | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index a547fff5f..01f3312be 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -94,9 +94,21 @@ module Puppet::Rails end if Puppet[:dbadapter] == "sqlite3" and ! FileTest.exists?(Puppet[:dblocation]) - require 'puppet/rails/database' + + dbdir = nil + $:.each { |d| + tmp = File.join(d, "puppet/rails/database") + if FileTest.directory?(tmp) + dbdir = tmp + end + } + + unless dbdir + raise Puppet::Error, "Could not find Puppet::Rails database dir" + end + begin - Puppet::Rails::Database.up + ActiveRecord::Migrator.migrate(dbdir) rescue => detail if Puppet[:trace] puts detail.backtrace diff --git a/lib/puppet/rails/database.rb b/lib/puppet/rails/database/01_puppet_initialize.rb index 8be05bd88..485634004 100644 --- a/lib/puppet/rails/database.rb +++ b/lib/puppet/rails/database/01_puppet_initialize.rb @@ -1,4 +1,4 @@ -class Puppet::Rails::Database < ActiveRecord::Migration +class PuppetInitialize < ActiveRecord::Migration require 'sqlite3' def self.up |