Switch database to postgres

Author: bhaak

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'dm-sqlite-adapter'
+gem 'dm-postgres-adapter'
 
 gem "dm-serializer",
     git: "https://github.com/89mo/dm-serializer.git",

Gemfile.lock

@@ -79,16 +79,16 @@ GEM
       dm-core (~> 1.2.0)
     dm-migrations (1.2.0)
       dm-core (~> 1.2.0)
-    dm-sqlite-adapter (1.2.0)
+    dm-postgres-adapter (1.2.0)
       dm-do-adapter (~> 1.2.0)
-      do_sqlite3 (~> 0.10.6)
+      do_postgres (~> 0.10.6)
     dm-timestamps (1.2.0)
       dm-core (~> 1.2.0)
     dm-transactions (1.2.0)
       dm-core (~> 1.2.0)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_sqlite3 (0.10.17)
+    do_postgres (0.10.17)
       data_objects (= 0.10.17)
     docile (1.4.1)
     et-orbi (1.2.11)
@@ -175,8 +175,8 @@ DEPENDENCIES
   ci_reporter
   data_mapper
   dm-migrations
+  dm-postgres-adapter
   dm-serializer!
-  dm-sqlite-adapter
   dm-types!
   eventmachine!
   fastercsv

Rakefile

@@ -11,8 +11,6 @@ require 'sync'
 require 'rake/dsl_definition'
 require 'rake'
 
-$db_access = Sync.new
-
 load File.expand_path('spec/spec.rake')
 
 # default database is development

lib/junethack/database.rb

@@ -15,18 +15,20 @@
   puts "Configuring production database"
   # for debugging: print all generated SQL statemtens
   #DataMapper::Logger.new("logs/db.log", :debug)
-  DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/junethack.db")
+  DataMapper.setup(:default, 'postgres://localhost/junethack')
 end
+
 configure :development do
   puts "Configuring development database"
   # for debugging: print all generated SQL statemtens
   DataMapper::Logger.new("logs/dev_db.log", :debug)
-  DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/junethack_dev.db")
+  DataMapper.setup(:default, 'postgres://localhost/junethack')
 end
+
 configure :test do
   puts "Configuring test database"
   DataMapper::Logger.new("logs/test_db.log", :debug)
-  DataMapper.setup(:default, "sqlite3::memory:")
+  DataMapper.setup(:default, "postgres://#{user}:#{password}@localhost/junethack_test")
 
   # suppress migration output.
   # it would be written at every run as we use a in-memory db

lib/junethack/fetch_games.rb

@@ -35,7 +35,7 @@ def fetch_all
         if server.xlogcurrentoffset == nil
             server.xlogcurrentoffset = header['content-length'].to_i
             server.xloglastmodified = header['last-modified'] || 'Thu, 01 Jan 1970 00:00:00 GMT'
-            $db_access.synchronize { server.save }
+            server.save
             next
         end
 
@@ -52,9 +52,6 @@ def fetch_all
                     #repository.adapter.execute("BEGIN IMMEDIATE TRANSACTION");
                     games.each do |line|
                       begin
-                        $db_access.lock :EX
-                        #@fetch_logger.debug $db_access.inspect
-
                         i += 1
                         #@fetch_logger.debug "#{line.length} #{line}"
                         xlog_add_offset = line.length
@@ -117,10 +114,6 @@ def fetch_all
                         # this game is completely input into the db
                         # don't parse it again
                         server.xlogcurrentoffset += xlog_add_offset
-                        server.save
-                      ensure
-                        $db_access.unlock :EX
-                        #@fetch_logger.debug $db_access.inspect
                       end
                     end
                     #repository.adapter.execute("COMMIT");
@@ -130,7 +123,7 @@ def fetch_all
                 @fetch_logger.debug "No games at all on #{server.name}!"
             end
             server.xloglastmodified = last_modified
-            $db_access.synchronize { server.save }
+            server.save
         else
             @fetch_logger.debug "No new games on #{server.name}."
         end

lib/junethack/models/game.rb

@@ -209,7 +209,7 @@ class Game
     property :conduct,   String, :default => "0"
     property :nconducts, Integer,
      :default => lambda { |r, p| (Integer(r.conduct) & 4095).to_s(2).count("1") } # count the number of bits set in conduct
-    property :conductX,  Text
+    property :conductX,  Text, :default => ''
     property :role,      String
     property :deathdnum, Integer
     property :gender,    String

lib/junethack/models/user.rb

@@ -72,7 +72,7 @@ def to_i
     end
 
     def User.max_created_at
-        repository.adapter.select "select strftime('%s',max(created_at)) from users"
+      repository.adapter.select('SELECT EXTRACT(EPOCH FROM MAX(created_at))::int FROM users')
     end
 
     def display_game_statistics