schema-evolution-manager 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b715c9cf03fdacc41dc06b26abb55d6cb863e36
-  data.tar.gz: 191c3f755d4e0e1a2058f215da8d1daf0e3d83e5
+  metadata.gz: 9a2b3925d1baff6b4fea5a7967b28a179903609d
+  data.tar.gz: cb346790f69179476bfd5d26d20460a270a4a9f9
 SHA512:
-  metadata.gz: e827b45cc139543d65a2055b272ef7c9933583db3f4f8a1242093c2f6494550967e621ea261afbec5a7a7008031c42c11fc5479afdf9f312d649de930b4753d7
-  data.tar.gz: ff685021c28187c7204c8c0fb92fea8251b092b87656e429c10474315f35a0f33f19e1bcc5990bd9ee1aa58069a4c6effd0acac41bf1add4eb1e97ff19adf57a
+  metadata.gz: bc5c07b0484b6173fdd807caaedd9e3ef5f38a3af05743f8769310122baec9975a751b00f5f1b1d8ac0a390c0fd67b78ff17dcb388dd8c14d6df6cd6cc54e03b
+  data.tar.gz: 881ad9e1b5a458b637f2579cdf275a163eca74c640680e6aec308b15d316a787398939d9b9f2ab58629813b6ed9416e52cd2d76761fbc4add05516c581712bbd

data/README.md

@@ -127,7 +127,7 @@ There are two ways to install schema evolution manager:
 
         git clone git://github.com/mbryzek/schema-evolution-manager.git
         cd schema-evolution-manager
-        git checkout 0.9.27
+        git checkout 0.9.28
         ruby ./configure.rb
         sudo ./install.rb
 

data/bin/sem-add

@@ -26,17 +26,10 @@ contents = IO.read(file)
 now = Time.now.strftime('%Y%m%d-%H%M%S')
 target = File.join(scripts_dir, "#{now}.sql")
 
-padding = 1000
-counter = 0
 while File.exists?(target)
-  counter += 1
-  if counter >= padding * 10
-    raise "ERROR: Cannot add more than #{padding * 10} files / second. Doing so would break the implementation of lexicographically sorted filenames"
-  end
-  # The .z prefix is here to ensure these files sort AFTER the first
-  # .sql file. Maintaining lexicographic sorting is important to
-  # support simple command line tools (e.g. ls)
-  target = File.join(scripts_dir, "#{now}.z#{padding + counter}.sql")
+  sleep 0.1
+  now = Time.now.strftime('%Y%m%d-%H%M%S')
+  target = File.join(scripts_dir, "#{now}.sql")
 end
 
 puts "Adding #{target}"

data/bin/sem-apply

@@ -36,7 +36,17 @@ begin
   end
 rescue SchemaEvolutionManager::ScriptError => e
   puts ""
-  puts "ERROR applying script: %s" % e.filename
+  puts "ERROR applying script: %s" % e.path
+
+  puts ""
+  if e.output.strip.empty?
+    puts "  ==> There was no error output"
+  else
+    puts "  " + e.output.strip.split("\n").map { |l|
+      "  #{l}"
+    }.join("\n").strip
+  end
+
   puts ""
   puts "If this script has previously been applied to this database, you can record it as having been applied by:"
   puts "  " + e.dml

data/lib/schema-evolution-manager/apply_util.rb

@@ -26,35 +26,17 @@ module SchemaEvolutionManager
         count += 1
         if @dry_run
           puts "[DRY RUN] Applying #{filename}"
-          apply_dry_run(filename, path)
+          puts path
+          puts ""
         else
           puts "Applying #{filename}"
-          apply_real(filename, path)
+          @db.psql_file(filename, path)
+          @scripts.record_as_run!(filename)
         end
       end
       count
     end
 
-    private
-    def apply_dry_run(filename, path)
-      puts path
-      puts ""
-    end
-
-    def apply_real(filename, path)
-      have_error = true
-      begin
-        @db.psql_file(path)
-        have_error = false
-      ensure
-        if have_error
-          raise ScriptError.new(@db, filename)
-        end
-      end
-
-      @scripts.record_as_run!(filename)
-    end
-
   end
 
 end

data/lib/schema-evolution-manager/db.rb

@@ -20,7 +20,7 @@ module SchemaEvolutionManager
       scripts = Scripts.new(self, Scripts::BOOTSTRAP_SCRIPTS)
       dir = File.join(Library.base_dir, "scripts")
       scripts.each_pending(dir) do |filename, path|
-        psql_file(path)
+        psql_file(filename, path)
         scripts.record_as_run!(filename)
       end
     end
@@ -59,7 +59,7 @@ module SchemaEvolutionManager
     end
 
     # executes sql commands from a file in a single transaction
-    def psql_file(path)
+    def psql_file(filename, path)
       Preconditions.assert_class(path, String)
       Preconditions.check_state(File.exists?(path), "File[%s] not found" % path)
 
@@ -72,7 +72,15 @@ module SchemaEvolutionManager
         end
 
         command = "psql --file \"%s\" #{options} %s" % [tmp, @url]
-        Library.system_or_error(command)
+
+        Library.with_temp_file do |output|
+          result = `#{command} &> #{output}`.strip
+          status = $?
+          if status.to_i > 0
+            errors = File.exists?(output) ? IO.read(output) : result
+            raise ScriptError.new(self, filename, path, errors)
+          end
+        end
       end
     end
 

data/lib/schema-evolution-manager/script_error.rb

@@ -2,15 +2,17 @@ module SchemaEvolutionManager
 
   class ScriptError < Exception
 
-    attr_reader :filename
+    attr_reader :path, :output
 
-    def initialize(db, filename)
+    def initialize(db, filename, path, output)
       @db = Preconditions.assert_class(db, Db)
       @filename = Preconditions.assert_class(filename, String)
+      @path = Preconditions.assert_class(path, String)
+      @output = Preconditions.assert_class(output, String)
     end
 
     def dml
-      sql_command = "insert into %s.%s (filename) values ('%s')" % [Db.schema_name, Scripts::SCRIPTS, filename]
+      sql_command = "insert into %s.%s (filename) values ('%s')" % [Db.schema_name, Scripts::SCRIPTS, @filename]
       "psql --command \"%s\" %s" % [sql_command, @db.url]
     end
 

data/lib/schema-evolution-manager/sem_version.rb

@@ -2,7 +2,7 @@ module SchemaEvolutionManager
 
   module SemVersion
 
-    VERSION = '0.9.27' # Automatically updated by util/create-release.rb
+    VERSION = '0.9.28' # Automatically updated by util/create-release.rb
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema-evolution-manager
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
 platform: ruby
 authors:
 - Michael Bryzek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies: []
 description: '["Michael Bryzek"]'
 email: mbryzek@alum.mit.edu
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Schema evolution manager is a simple schema migration tool for postgresql