dbagent 3.2.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e62569d42b3c020a5aadedf966a8508fa32fe657a07adffe0dc712e36344c5
-  data.tar.gz: 31c24c2bb2b5888846dd8bbeb2f17eddcf40894439df568188335bfd1abc342d
+  metadata.gz: d63bf0c7e2699b356813cd4d71eb28a812a0432e5dc39f8b3b4097b0e63e0664
+  data.tar.gz: 19b4815533138bd1a3544366bde4b7ee40daeb963268836c956a1b5abbd38915
 SHA512:
-  metadata.gz: 74994c047b77abceff18643b9dc5f48fb15a0ebb44afec1c53064396ea11418cc887e2ba7095de676f44c35269a33c33e93b0a041c179d61ed65b1ee6cd50a2f
-  data.tar.gz: 26c54890973d3553c358c9d848e6abc16b36a52d09bcb3f31d163881a8efee2debe73686331c7fd0c328cac8d0f354faa335db6a638c1234e51f6bec1c99e67b
+  metadata.gz: 19d9883a82ad142391cbf3fdb0c06177ddb3b72495c0ce3d48aaaa178a3bbf7529692a6c8622e17daf70807e848e6dce288026a041e520fb06cf30daccbe088a
+  data.tar.gz: be304ecb123c8933fa16f606178fb65d3a29d0eedec042dae449a39a092eae371dad06efe78625cdc83a1011eea5c78c7889c904ac6f27c5434a886de9d6a6e1

data/README.md

@@ -31,6 +31,7 @@ See the examples folder for details.
 * `DBAGENT_SUPER_USER`      Superuser name (postgres only)
 * `DBAGENT_SUPER_DB`        Superuser database (postgres only)
 * `DBAGENT_SUPER_PASSWORD`  Superuser password (postgres only)
+* `DBAGENT_WAIT_TIMEOUT_IN_SEC` Timeout in seconds before db:wait_server and db:wait give up
 * `DBAGENT_VIEWPOINT`       Bmg viewpoint (class name) when using db:flush
 
 ## Available rake tasks
@@ -51,6 +52,8 @@ rake db:spy              # Dumps the schema documentation into database/schema
 rake db:backup           # Makes a database backup to the backups folder
 rake db:restore[match]   # Restore the last matching database backup file from backups folder
 rake db:revive           # Shortcut for both db:restore and db:migrate
+rake db:wait_server      # Waits until the postgresql host seems available
+rake db:wait             # Waits until the postgresql database seems available
 rake db:tables           # List tables with those with fewer dependencies first
 rake db:dependencies[of] # List tables that depend of a given one
 ```

data/lib/db_agent/db_handler/mssql.rb

@@ -19,8 +19,20 @@ module DbAgent
       end
 
       def spy
-        jdbc_jar = (Path.dir.parent/'vendor').glob('mssql*.jar').first
-        system %Q{java -jar vendor/schemaSpy_5.0.0.jar -dp #{jdbc_jar} -t mssql05 -host #{config[:host]} -u #{config[:user]} -p #{config[:password]} -db #{config[:database]} -port #{config[:port]} -s dbo -o #{schema_folder}/spy}
+        spy_jar = DbAgent._!('vendor').glob('schema*.jar').first
+        jdbc_jar = DbAgent._!('vendor').glob('mssql*.jar').first
+        cmd = ""
+        cmd << %Q{java -jar #{spy_jar}}
+        cmd << %Q{ -dp #{jdbc_jar} -t mssql05}
+        cmd << %Q{ -host #{config[:host]}}
+        cmd << %Q{ -u #{config[:user]}}
+        cmd << %Q{ -p #{config[:password]}}
+        cmd << %Q{ -db #{config[:database]}}
+        cmd << %Q{ -port #{config[:port]}}
+        cmd << %Q{ -s dbo}
+        cmd << %Q{ -o #{schema_folder}/spy}
+        cmd << %Q{ #{ENV['SCHEMA_SPY_ARGS']}} if ENV['SCHEMA_SPY_ARGS']
+        system(cmd)
         system %Q{open #{schema_folder}/spy/index.html}
       end
 

data/lib/db_agent/db_handler/mysql.rb

@@ -21,9 +21,21 @@ module DbAgent
       end
 
       def spy
-        jdbc_jar = (Path.dir.parent / 'vendor').glob('mysql*.jar').first
-        system %(java -jar vendor/schemaSpy_5.0.0.jar -dp #{jdbc_jar} -t mysql -host #{config[:host]} -u #{config[:user]} -p #{config[:password]} -db #{config[:database]} -s public -o #{schema_folder}/spy)
-        system %(open #{schema_folder}/spy/index.html)
+        spy_jar = DbAgent._!('vendor').glob('schema*.jar').first
+        jdbc_jar = DbAgent._!('vendor').glob('mysql*.jar').first
+        cmd = ""
+        cmd << %Q{java -jar #{spy_jar}}
+        cmd << %Q{ -dp #{jdbc_jar} -t mysql}
+        cmd << %Q{ -host #{config[:host]}}
+        cmd << %Q{ -u #{config[:user]}}
+        cmd << %Q{ -p #{config[:password]}}
+        cmd << %Q{ -db #{config[:database]}}
+        cmd << %Q{ -port #{config[:port]}}
+        cmd << %Q{ -s public}
+        cmd << %Q{ -o #{schema_folder}/spy}
+        cmd << %Q{ #{ENV['SCHEMA_SPY_ARGS']}} if ENV['SCHEMA_SPY_ARGS']
+        system(cmd)
+        system %Q{open #{schema_folder}/spy/index.html}
       end
 
       def restore(_t, args)

data/lib/db_agent/db_handler/postgresql.rb

@@ -25,12 +25,16 @@ module DbAgent
         spy_jar = DbAgent._!('vendor').glob('schema*.jar').first
         jdbc_jar = DbAgent._!('vendor').glob('postgresql*.jar').first
         cmd = ""
-        cmd << %Q{java -jar #{spy_jar} -dp #{jdbc_jar} -t pgsql}
+        cmd << %Q{java -jar #{spy_jar}}
+        cmd << %Q{ -dp #{jdbc_jar} -t pgsql}
         cmd << %Q{ -host #{config[:host]}}
         cmd << %Q{ -port #{config[:port]}} if config[:port]
         cmd << %Q{ -u #{config[:user]}}
         cmd << %Q{ -p #{config[:password]}} if config[:password]
-        cmd << %Q{ -db #{config[:database]} -s public -o #{schema_folder}/spy}
+        cmd << %Q{ -db #{config[:database]}}
+        cmd << %Q{ -s public}
+        cmd << %Q{ -o #{schema_folder}/spy}
+        cmd << %Q{ #{ENV['SCHEMA_SPY_ARGS']}} if ENV['SCHEMA_SPY_ARGS']
         system(cmd)
         system %Q{open #{schema_folder}/spy/index.html}
       end

data/lib/db_agent/db_handler.rb

@@ -42,8 +42,8 @@ module DbAgent
       require 'net/ping'
       raise "No host found" unless config[:host]
       check = Net::Ping::External.new(config[:host])
-      puts "Trying to ping `#{config[:host]}`"
-      15.downto(0) do |i|
+      print "Trying to ping `#{config[:host]}`\n"
+      wait_timeout_in_seconds.downto(0) do |i|
         print "."
         if check.ping?
           print "\nServer found.\n"
@@ -58,14 +58,18 @@ module DbAgent
     end
 
     def wait
-      15.downto(0) do |i|
+      print "Using #{config}\n"
+      wait_timeout_in_seconds.downto(0) do |i|
+        print "."
         begin
-          puts "Using #{config}"
           sequel_db.test_connection
-          puts "Database is there. Great."
+          print "\nDatabase is there. Great.\n"
           break
         rescue Sequel::Error
-          raise if i==0
+          if i==0
+            print "\n"
+            raise
+          end
           sleep(1)
         end
       end
@@ -123,6 +127,16 @@ module DbAgent
       Path.require_tree(f) if f.directory?
     end
 
+  private
+
+    def wait_timeout_in_seconds
+      (ENV['DBAGENT_WAIT_TIMEOUT_IN_SEC'] || '15').to_i
+    end
+
+    def print(*args)
+      super.tap{ $stdout.flush }
+    end
+
   end # class DbHandler
 end # module DbAgent
 require_relative 'db_handler/postgresql'

data/lib/db_agent/seeder.rb

@@ -18,11 +18,13 @@ module DbAgent
           pairs[p1].basename <=> pairs[p2].basename
         }
 
-        # Truncate tables then fill them
+        # Truncate tables
         names.reverse.each do |name|
           LOGGER.info("Emptying table `#{name}`")
           handler.sequel_db[name.to_sym].delete
         end
+
+        # Fill them
         names.each do |name|
           LOGGER.info("Filling table `#{name}`")
           file = pairs[name]
@@ -33,6 +35,29 @@ module DbAgent
       end
     end
 
+    def insert_script(from)
+      folder = handler.data_folder/from
+
+      # load files in order
+      pairs = merged_data(from)
+      names = pairs.keys.sort{|p1,p2|
+        pairs[p1].basename <=> pairs[p2].basename
+      }
+
+      # Fill them
+      names.each do |name|
+        file = pairs[name]
+        data = file.load
+        next if data.empty?
+
+        keys = data.first.keys
+        values = data.map{|t|
+          keys.map{|k| t[k] }
+        }
+        puts handler.sequel_db[name.to_sym].multi_insert_sql(keys, values)
+      end
+    end
+
     def flush_empty(to = "empty")
       target = (handler.data_folder/to).rm_rf.mkdir_p
       (target/"metadata.json").write <<-JSON.strip

data/lib/db_agent/version.rb

@@ -1,6 +1,6 @@
 module DbAgent
 
   # Current version of DbAgent
-  VERSION = "3.2.1"
+  VERSION = "3.5.0"
 
 end

data/tasks/db.rake

@@ -81,6 +81,12 @@ namespace :db do
   end
   task :seed => :require
 
+  desc "Prints an INSERT script for a particular data set"
+  task :insert_script, :from do |t,args|
+    Seeder.new(db_handler).insert_script(args[:from] || 'empty')
+  end
+  task :insert_script => :require
+
   desc "Flushes the database as a particular data set"
   task :flush, :to do |t,args|
     Seeder.new(db_handler).flush(args[:to] || Time.now.strftime("%Y%M%d%H%M%S").to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbagent
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: A tool to migrate, spy and seed relational databases.