psql-cm 0.1.0 → 0.1.1

data/History.md

@@ -1,3 +1,11 @@
+# 0.1.1 - 2012-04-27
+
+Documentation and debugging enhancements.
+
+Setup now properly uses --no-privileges
+
+Restore now ensures it uses the correct schema and loops over the change rows.
+
 # 0.1.0 - 2012-04-24
 
 Ensure pgpass file is created if it does not exist.

data/lib/psql-cm/base.rb

@@ -1,15 +1,15 @@
 module PSQLCM
   class << self
-    def verbose(message)
-      $stdout.puts message if (config.verbose || config.debug)
+    def verbose(*message)
+      $stdout.puts message.join(' ') if (config.verbose || config.debug)
     end
 
-    def debug(message)
-      $stdout.puts message if config.debug
+    def debug(*message)
+      $stdout.puts message.join(' ') if config.debug
     end
 
-    def halt!(message)
-      $stderr.puts message
+    def halt!(*message)
+      $stderr.puts message.join(' ')
       exit 1
     end
 

data/lib/psql-cm/database.rb

@@ -4,7 +4,7 @@ module PSQLCM
 
     def initialize(options = {})
       @config = ::PSQLCM.config.connection.merge(options)
-      @config[:dbname] = options[:dbname] || 'postgres'
+      @config[:dbname] = options[:dbname] if options[:dbname]
 
       super # For delegator pattern:
       @delegated_object = db
@@ -84,10 +84,17 @@ module PSQLCM
       timeout = query.detect { |k| k.match /connect_timeout=/ }.to_s.sub(/.*=/,'')
       sslmode = query.detect { |k| k.match /sslmode=/ }.to_s.sub(/.*=/,'')
 
+      database = uri.path.split('/').first.to_s
+      database = 'postgres' if database.empty?
+
+      unless @config.databases.detect { |name| name == database }
+        @config.databases << database
+      end
+
       @config.connection = {
         :host => uri.host,
         :port => uri.port || 5432,
-        :dbname => "postgres", # uri.path.sub('/',''),
+        :dbname => database,
         :user => uri.user || ENV['USER'],
         :password => uri.password,
         :connect_timeout => timeout.empty? ? 20 : timeout.to_i,

data/lib/psql-cm/dump.rb

@@ -15,8 +15,9 @@ 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=#{schema}.#{config.cm_table}
-                 #{database} ].join(' ')
+                 --schema=#{schema} --file=#{cm_file}
+                 --table=#{schema}.#{config.cm_table} #{database}
+            ].join(' ')
           end
         end
 

data/lib/psql-cm/restore.rb

@@ -19,42 +19,52 @@ module PSQLCM
               schema = cm_file.sub(".sql",'')
               ensure_schema_exists(database,schema)
 
-              debug "restore> #{database}:#{schema} < #{cm_file}"
-              sh "psql #{db(database).psql_args} #{database} < #{cm_file}"
-
-              ensure_cm_table_exists(database,schema)
-              Tempfile.open('base.sql') do |temp_file|
-                row = db(database).exec("SELECT content from #{schema}.#{config.cm_table}
-                                      WHERE is_base IS true ORDER BY created_at
-                                      DESC LIMIT 1;")
-                temp_file.write(row)
-                sh "psql #{db(database).psql_args} #{database} < #{temp_file.path}"
+              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
 
-              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 "change>\n#{row['content']}"
-                Tempfile.open('base.sql') do |temp_file|
-                  temp_file.write(row['content'])
-                  temp_file.close
+              begin
+                tag = "restore:#{database}:#{schema}>"
+                debug tag, cm_file
+                sh "psql #{db(database).psql_args} #{database} < #{cm_file}"
+
+                ensure_cm_table_exists(database,schema)
 
-                  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}; "
+                sql = "SELECT content from #{schema}.#{config.cm_table}
+                       WHERE is_base IS true ORDER BY created_at ASC;"
+                debug tag, "base:sql> #{sql}"
+                db(database).exec(sql).each do |base_row|
+                  debug "BASE content:", base_row['content']
+                  Tempfile.open('base.sql') do |file|
+                    file.write(base_row['content'])
+                    sh "psql #{db(database).psql_args} #{database} < #{file.path}"
                   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
+
+                sql = "SELECT content from #{schema}.#{config.cm_table}
+                       WHERE is_base IS false
+                       ORDER BY created_at ASC;"
+
+                debug tag, "changes:sql> #{sql}"
+                changes = db(database).exec(sql)
+                debug tag, "change:count>#{changes.cmd_tuples}"
+                changes.each do |row|
+                  debug tag, "content>\n#{row['content']}"
+                  Tempfile.open('change.sql') do |file|
+                    file.write(row['content'])
+                    file.close
+                    sh "psql #{db(database).psql_args} #{database} < #{file.path}"
                   end
                 end
+              ensure
+                File.open(psqlrc_file,'w') do |file|
+                  file.rewind
+                  file.write psqlrc
+                end
               end
             end
           end
@@ -62,5 +72,5 @@ module PSQLCM
       end
     end # def restore!
 
-  end
-end
+  end # class << self
+end # module PSQLCM

data/lib/psql-cm/setup.rb

@@ -8,7 +8,10 @@ module PSQLCM
           ensure_cm_table_exists(database,schema)
 
           Tempfile.open('base.sql') do |temp_file|
-            sh " pg_dump #{db(database).psql_args} --schema-only --no-owner --schema=#{schema} --file=#{temp_file.path} #{database}"
+            sh %W[ pg_dump #{db(database).psql_args}
+            --schema-only --no-owner --no-privileges
+            --schema=#{schema} --file=#{temp_file.path} #{database}
+            ].join(' ')
 
             content = %x{cat #{temp_file.path}}
             name = %x{git config user.name}.strip

data/lib/psql-cm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psql-cm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg