replace sqlite with configurable db

1 files changed, 17 insertions, 7 deletions

diff --git a/lib/validation_db.rb b/lib/validation_db.rb
index ee47365..702fef5 100644
--- a/lib/validation_db.rb
+++ b/lib/validation_db.rb
@@ -72,11 +72,21 @@ module Lib
 end
 
 # sqlite is used for storing validations and crossvalidations
-sqlite = "#{File.expand_path(File.dirname(__FILE__))}/#{Sinatra::Base.environment}.sqlite3"
-DataMapper.setup(:default, "sqlite3:///#{sqlite}")
+#sqlite = "#{File.expand_path(File.dirname(__FILE__))}/#{Sinatra::Base.environment}.sqlite3"
+#DataMapper.setup(:default, "sqlite3:///#{sqlite}")
+#unless FileTest.exists?("#{sqlite}")
+#  [Lib::Validation, Lib::Crossvalidation].each do |model|
+#    model.auto_migrate!
+#  end
+#end
 
-unless FileTest.exists?("#{sqlite}")
-  [Lib::Validation, Lib::Crossvalidation].each do |model|
-    model.auto_migrate!
-  end
-end
\ No newline at end of file
+DataMapper.setup(:default, { 
+    :adapter  => @@config[:database]["adapter"],
+    :database => @@config[:database]["database"],
+    :username => @@config[:database]["username"],
+    :password => @@config[:database]["password"],
+    :host     => @@config[:database]["host"]
+  })
+[Lib::Validation, Lib::Crossvalidation].each do |resource|
+    resource.auto_migrate! unless resource.storage_exists?
+end