swarm_cluster_cli_ope 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deeeb31f5b17f54bd476bb6cc8100c91dbba91386188ee468e14b1d50c36b99a
-  data.tar.gz: d6cd6932874bd1d393b4c975e1978f64db2870f3705bb3e243f4792114c60a42
+  metadata.gz: 0c8d4d620c7c8929ca7606a553347601906ebdf99c13ac77c103ee94e4d46c74
+  data.tar.gz: cb045c6a4f21ba1482e79b1d810476677c509ac737cc3ef000bd68afb34ea5eb
 SHA512:
-  metadata.gz: 694ec83f00a6c979fbb1f525d02194d3bdb58cd6a91239a511774d1d3ef9a3a38cd9068edcd3757a2318cc3f863b6c362692519500cd4d4436f431fa3a091320
-  data.tar.gz: 3bcb05e5402cf1750908310b29fa930424da6afb74f2157978989e0a7872f94b6090122e0d7bd1568b8ef408bf75d1dc0cc1ac12abadda1416b1bc372985346e
+  metadata.gz: 34772d9e2eb49263ec059a78bcbaa75629043f3d58b2c47c15c8061c430f995d6c5af6100b66c63781b17d450e012574f32a3c48228b24e2c51fc587904204e6
+  data.tar.gz: 1f59ee9abaf08937a09f26e6f0d7c77d88b595154aac0a0b9399299a4dc2bb7ffb59c7c5906d4fbcdf9d69967ccbc8765fee58e64334544f19a48267fb93d75e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swarm_cluster_cli_ope (0.5.1)
+    swarm_cluster_cli_ope (0.5.2)
       activesupport
       open4
       thor (~> 1.0)

data/lib/swarm_cluster_cli_ope/sync_configs/post_gres.rb

@@ -2,7 +2,6 @@ module SwarmClusterCliOpe
   module SyncConfigs
     class PostGres < BaseDatabase
 
-
       def pull
         resume('pull')
 
@@ -13,11 +12,11 @@ module SwarmClusterCliOpe
           local.container.copy_in(tmp_file, tmp_file)
 
           # drop old db and recreate
-          if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
-            close_connections_and_drop_cmd(local)
-          else
-            raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
-          end
+          # if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
+          close_connections_and_drop_cmd(local)
+          # else
+          #   raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
+          # end
 
           create_cmd(local)
 
@@ -37,12 +36,8 @@ module SwarmClusterCliOpe
           dump_cmd(local, tmp_file)
           remote.container.copy_in(tmp_file, tmp_file)
 
-          # drop old db and recreate
-          if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
-            close_connections_and_drop_cmd(remote)
-          else
-            raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
-          end
+          close_connections_and_drop_cmd(remote)
+
           create_cmd(remote)
 
           restore_cmd(remote, tmp_file)
@@ -125,23 +120,31 @@ module SwarmClusterCliOpe
 
       end
 
-
       # @param [EnvConfigs] config
       def close_connections_and_drop_cmd(config)
+
         cmd = []
-        cmd << "export PGPASSWORD=\"#{config.password}\" &&"
 
-        sql = []
-        sql << "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname =  '\"'\"'#{config.database_name}'\"'\"' AND pid <> pg_backend_pid();;"
-        sql << "DROP DATABASE IF EXISTS #{config.database_name};"
+        if Gem::Version.new(config.database_version) >= Gem::Version.new("13")
+          cmd << "export PGPASSWORD=\"#{config.password}\" &&"
+          cmd << 'dropdb --force --if-exists'
+          cmd << "-U #{config.username}"
+          cmd << config.database_name
 
-        cmd << "echo \"#{sql.join(" ")}\" "
-        cmd << '|'
-        cmd << 'psql'
-        cmd << "-U #{config.username}"
-        cmd << "postgres"
-        cmd
+        else
+          cmd << "export PGPASSWORD=\"#{config.password}\" &&"
 
+          sql = []
+          sql << "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname =  '\"'\"'#{config.database_name}'\"'\"' AND pid <> pg_backend_pid();;"
+          sql << "DROP DATABASE IF EXISTS #{config.database_name};"
+
+          cmd << "echo \"#{sql.join(" ")}\" "
+          cmd << '|'
+          cmd << 'psql'
+          cmd << "-U #{config.username}"
+          cmd << "postgres"
+
+        end
         logger.info { "CLOSE CONNECTIONS COMMAND: #{cmd.join(' ')}" }
         config.container.exec("bash -c '#{cmd.join(' ')}'")
       end
@@ -153,7 +156,6 @@ module SwarmClusterCliOpe
       # PGPASSWORD='root' createdb  -U root  -h 0.0.0.0  -p 32790  development;
       # PGPASSWORD='root' psql  -U root  -h 0.0.0.0  -p 32790  -d development < ./cortobio_production_new_2020-09-10-171742.sql
 
-
     end
   end
 end

data/lib/swarm_cluster_cli_ope/version.rb

@@ -1,3 +1,3 @@
 module SwarmClusterCliOpe
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swarm_cluster_cli_ope
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor