psql-cm 0.0.9 → 0.1.0

data/History.md

@@ -1,3 +1,13 @@
+# 0.1.0 - 2012-04-24
+
+Ensure pgpass file is created if it does not exist.
+
+Ensure connections get closed.
+
+Account for setting schema when restoring.
+
+Specify schema in --table specifier within pg\_dump command.
+
 # 0.0.9 - 2012-04-23
 
 Dump now uses --no-privileges, privileges should be handled separately.

data/lib/psql-cm/database.rb

@@ -24,6 +24,8 @@ module PSQLCM
 
     def connect!
       @db = PG.connect(@config)
+      ObjectSpace.define_finalizer(self, proc { @db.close })
+      @db
     end
 
     def reconnect!(name = @config[:dbname])
@@ -36,19 +38,20 @@ module PSQLCM
     end
 
     def pgpass # Ensure a pgpass entry exists for this connection.
+      pgpass_file = File.join(ENV['HOME'], '.pgpass')
+      FileUtils.touch(pgpass_file) unless File.exists?(pgpass_file)
+
       pgpass_line = [ @config[:host], @config[:port], @config[:dbname],
                       @config[:user], @config[:password] ].join(':')
 
-      content = File.open(File.join(ENV['HOME'], '.pgpass'), 'r') do |file|
-        file.read
-      end.split("\n")
+      content = File.read(pgpass_file).split("\n")
 
       unless content.detect{ |line| line == pgpass_line }
-        File.open(File.join(ENV['HOME'], '.pgpass'), 'w') do |file|
+        File.open(pgpass_file, 'w') do |file|
           content << pgpass_line
           file.write(content.join("\n") + "\n")
         end
-        File.chmod(0600, File.join(ENV['HOME'], '.pgpass'))
+        File.chmod(0600, pgpass_file)
       end
       pgpass_line
     end # def pgpass

data/lib/psql-cm/dump.rb

@@ -15,7 +15,7 @@ module PSQLCM
             cm_file = File.join(sql_path,database,"#{schema}.sql")
 
             sh %W[ pg_dump #{db(database).psql_args} --no-privileges --no-owner
-                 --schema=#{schema} --file=#{cm_file} --table=#{config.cm_table}
+                 --schema=#{schema} --file=#{cm_file} --table=#{schema}.#{config.cm_table}
                  #{database} ].join(' ')
           end
         end

data/lib/psql-cm/restore.rb

@@ -32,11 +32,28 @@ module PSQLCM
               end
 
               sql = "SELECT content from #{schema}.#{config.cm_table} where is_base IS false ORDER BY created_at ASC;"
+              debug "sql> #{sql}"
               db(database).exec(sql).each do |row|
-                debug "restoring cm row: #{row}"
+                debug "change>\n#{row['content']}"
                 Tempfile.open('base.sql') do |temp_file|
-                  temp_file.write(row)
-                  sh "psql #{db(database).psql_args} #{database} < #{temp_file.path}"
+                  temp_file.write(row['content'])
+                  temp_file.close
+
+                  psqlrc_file = File.join(ENV['HOME'],'.psqlrc')
+                  FileUtils.touch(psqlrc_file) unless File.exists?(psqlrc_file)
+                  psqlrc = File.read(psqlrc_file)
+                  File.open(psqlrc_file,'w') do |file|
+                    file.rewind
+                    file.write "SET search_path TO #{schema}; "
+                  end
+                  begin
+                    sh "psql #{db(database).psql_args} #{database} < #{temp_file.path}"
+                  ensure
+                    File.open(psqlrc_file,'w') do |file|
+                      file.rewind
+                      file.write psqlrc
+                    end
+                  end
                 end
               end
             end

data/lib/psql-cm/version.rb

@@ -1,4 +1,4 @@
 module PSQLCM
-  Version = '0.0.9'
+  Version = '0.1.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psql-cm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: PostgreSQL CM