pg_conn 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 071d157c556ff70c14231ebf8dc42e86acb85fdda7cf1c99ec1e3188f7d2c339
-  data.tar.gz: 23ac40bccd0bfc8e535414ff104d998aa257a879ae52164b5aedf6c421bbb4a8
+  metadata.gz: 76fdcf256d3aad348c24f37835e191c54c79b2b50a18cb188a4f1617012bd98c
+  data.tar.gz: ff82f8edad653121fde93d3742ea5cec1b23d9959a9c01550331a465e4eaa9d3
 SHA512:
-  metadata.gz: 7f8b56cc58d3e721b5bd2cf3efd88d4b478d6900e3654a311f5b0f99ab85c341ddcd406ac694c2d307c0a93e789fcfb0f458934e58cd6810267cee5e68fc5a6a
-  data.tar.gz: 32d1e368f8a02e3bd33a15cdb1d29b7dc55f8d3a96ccda39eef51ff737112945bcba3320a03b74b5045423f075e3fecdef89131b8338a1fd5104f5d1ba2696af
+  metadata.gz: 0ba5bb473f0483b9df83d657b061f57b8afd43f69372e81f02e88564b0eaa5af3aa0924e2500294f5ff9f77b798fef9000be924c383d50d8bc3c3e8f6261f69f
+  data.tar.gz: 127c0070c97925da62ee3dbc2251da49c7185fb07ac39f96bc4a80f6b477a7e438bcee5e8c07402a6b8e4beb781d3059bdf1f01ddaa80a4944dd6e160417face

data/lib/pg_conn/rdbms_methods.rb

@@ -72,26 +72,31 @@ module PgConn
     # schema is recreated afterwards unless :public is false. Uses the current
     # database if @database is nil
     #
+    # :include lists schemas to drop, the default is every schema. :exclude
+    # lists schemas to keep, the default is to drop all schemas
+    #
     # Note that the database can have active users logged in while the database
     # is emptied. TODO Explain what happens if the users have active
     # transactions. Should the be terminated?
     #
-    def empty!(database = nil, public: true, exclude: [])
+    def empty!(database = nil, public: true, include: [], exclude: [])
       local = !database.nil?
       begin
         conn = local ? PgConn.new(database) : self.conn
         schemas =
             conn
               .values("select nspname from pg_namespace where nspowner != 10 or nspname = 'public'")
-              .select { |schema| !exclude.include?(schema) }
-              .join(", ")
-        conn.exec "drop schema #{schemas} cascade"
-
-        # FIXME FIXME FIXME SECURITY Why grant 'create' to public?
-        conn.exec %(
-            create schema public authorization postgres;
-            grant usage, create on schema public to public
-        ) if public
+              .select { |schema| include.empty? || include.include?(schema) }
+              .reject { |schema| exclude.include?(schema) }
+        conn.exec "drop schema #{schemas.join(", ")} cascade"
+
+        if public && schemas.include?("public")
+          # FIXME FIXME FIXME SECURITY Why grant 'create' to public?
+          conn.exec %(
+              create schema public authorization postgres;
+              grant usage, create on schema public to public
+          )
+        end
       ensure
         conn&.terminate if local
       end

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.56.0"
+  VERSION = "0.57.0"
 end

data/lib/pg_conn.rb

@@ -1,5 +1,6 @@
 require "pg"
 require 'ostruct'
+require 'open3'
 require 'json'
 
 require_relative "pg_conn/version"
@@ -156,7 +157,7 @@ module PgConn
 
     # Name of database
     def name() @pg_connection.db end
-    alias_method :database, :name # Obsolete FIXME Is it?
+    alias_method :database, :name # Obsolete FIXME Is it? No
 
     # Database manipulation methods: #exist?, #create, #drop, #list
     attr_reader :rdbms
@@ -1066,7 +1067,7 @@ module PgConn
       end
     end
 
-    # Execute SQL og pgsql file. The file must be pure SQL or pgsql statements,
+    # Execute SQL or pgsql file. The file must be pure SQL or pgsql statements,
     # not psql meta commands. Any output from the file is ignored
     def sqlexec(file, **opts)
       source = IO.read(file) or error "Can't read #{file}"
@@ -1081,46 +1082,14 @@ module PgConn
         output, errors, status = Open3.capture3 %(
             psql -U #{username} -d #{database} --no-psqlrc -c '\\set ON_ERROR_STOP on' -f #{file}
         )
-
         status.success? or raise PG::Error.new(errors)
-
         output
-
       rescue PG::Error => ex
         if @error.nil?
           @error = ex
           @err = nil
         end
-
-        # Process message
-        if !silent
-          $stderr.puts errors
-        end
-
-#       puts "-------------------"
-#       puts "ERRORS"
-#       puts errors
-#       puts "OUTPUT"
-#       puts output
-#       puts "EXCEPTION"
-#       puts ex.message
-#       puts "-------------------"
-#
-#       if @error.message =~ /^\S* (ERROR.*)/
-#         puts "BING #{silent}"
-#         message = $1
-#         puts "MESSAGE: #{message}"
-#         saved_silent = self.silent
-#         self.silent = silent
-#         message_processor(message, file)
-#         self.silent = saved_silent
-#       elsif !silent
-#         puts "BANG"
-#         $stderr.puts errors
-#       else
-#         puts "NOTHING"
-#       end
-
+        $stderr.puts errors if !silent
         raise if fail
         nil
       end
@@ -1322,6 +1291,7 @@ module PgConn
     def commit() pop_transaction(fail: false) end
     def rollback() pop_transaction(commit: false, fail: false) end
 
+    # FIXME: Columns with the same name are collapsed
     def dump(*query)
       records = self.records(*query)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Claus Rasmussen