pg_conn 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac1d6afe8aefb33c2abfb88f2741ff2e1d1bacf4d6abc1936ecd178a36eaec5
-  data.tar.gz: 1596428cde81f7d3fe9cb9087e2c6c8c3d8a58ff696ead2156b512cb72ea6497
+  metadata.gz: 9c6b35126469d1a4c72a3ecdfe32502266eefce16574d91f0b00b9c969b586f8
+  data.tar.gz: ad15bf23023dad7d1a41716c7d3587e0b27400c4fee41bb3870f692adef9e908
 SHA512:
-  metadata.gz: a04dd7e76e131e04e4e1b37786b2667bc09786ae5dc570fc3d4cd6a52909ea9d2335e27b0bfa5ca1fb30d371e76055f8d498d106f919e52cb001a0f7b11e3a60
-  data.tar.gz: 31db0d179111b95440acf06b743c3cefbf30900f85ac311b81c82a224f73e5b871439ede71d2bf5b50393bfd0c79c75254d33ab77f1a26c998ec9a2bc855888e
+  metadata.gz: b49f50d2ceb9b87e55d6ae9a076bc477db4e5df474fa291d1c9f03747bb919996b209ec2bf15680651d93b1900f9067690a5653d2e492834348d6c4996b8d2de
+  data.tar.gz: 62ad8e07479117796196ff0cf8894a7d4562ab4d6f54eccf826830ba03df0d69897277fb307e7fb0e924e701b8bbe95ea5d81b9b5d0e964b36e879e318e2f11a

data/lib/pg_conn/rdbms_methods.rb

@@ -69,13 +69,13 @@ module PgConn
     end
 
     # Hollow-out a database by removing all schemas in the database. The public
-    # schema is recreated afterwards. Use the current database if @database is
-    # nil
+    # schema is recreated afterwards if :public is true. Uses the current
+    # database if @database is nil
     #
     # Note that the database can have active users logged in while the database
     # is emptied
     #
-    def empty!(database = nil, exclude: [])
+    def empty!(database = nil, public: true, exclude: [])
       local = !database.nil?
       begin
         conn = local ? PgConn.new(database) : self.conn
@@ -84,11 +84,11 @@ module PgConn
               .values("select nspname from pg_namespace where nspowner != 10 or nspname = 'public'")
               .select { |schema| !exclude.include?(schema) }
               .join(", ")
+        conn.exec "drop schema #{schemas} cascade"
         conn.exec %(
-            drop schema #{schemas} cascade;
             create schema public authorization postgres;
             grant usage, create on schema public to public
-        )
+        ) if public
       ensure
         conn&.terminate if local
       end

data/lib/pg_conn/role_methods.rb

@@ -44,11 +44,10 @@ module PgConn
     # Create a new role
     def create(rolename, superuser: false, create_database: false, can_login: false, create_role: false)
       user_decl = "create role \"#{rolename}\""
-      superuser_decl = superuser ? "--superuser" : nil
-      create_database_decl = create_database ? "--createdb" : "--nocreatedb"
-      can_login_decl = can_login ? "--login" : "--nologin"
-      create_role_decl = create_role ? "--createrole" : "--nocreaterole"
-
+      superuser_decl = superuser ? "superuser" : "nosuperuser"
+      create_database_decl = create_database ? "createdb" : "nocreatedb"
+      can_login_decl = can_login ? "login" : "nologin"
+      create_role_decl = create_role ? "createrole" : "nocreaterole"
       stmt = [user_decl, superuser_decl, can_login_decl, create_role_decl].compact.join(" ")
       conn.exec stmt
     end

data/lib/pg_conn/schema_methods.rb

@@ -35,8 +35,8 @@ module PgConn
       true
     end
 
-    # List schemas. By built-in schemas are not listed unless the :all option
-    # is true. The :exclude option can be used to exclude named schemas
+    # List schemas. Built-in schemas are not listed unless the :all option is
+    # true. The :exclude option can be used to exclude named schemas
     def list(all: false, exclude: [])
       conn.values(%(
           select schema_name
@@ -53,7 +53,7 @@ module PgConn
 
     # Return true if table exists
     def exist_table?(schema, table)
-      conn.exist?(relation_exist_query(schema, table, kind: %w(r)))
+      conn.exist?(relation_exist_query(schema, table, kind: %w(r f)))
     end
 
     # Return true if view exists
@@ -73,7 +73,7 @@ module PgConn
 
     # Return list of tables in the schema
     def list_tables(schema)
-      conn.values relation_list_query(schema, kind: %w(r))
+      conn.values relation_list_query(schema, kind: %w(r f))
     end
 
     # Return list of view in the schema
@@ -103,7 +103,7 @@ module PgConn
 
   private
     def relation_exist_query(schema, relation, kind: nil)
-      kind_sql_list = "'" + (kind.nil? ? %w(r v m) : Array(kind).flatten).join("', '") + "'"
+      kind_sql_list = "'" + (kind.nil? ? %w(r f v m) : Array(kind).flatten).join("', '") + "'"
       %(
           select  1
           from    pg_class 
@@ -114,7 +114,7 @@ module PgConn
     end
 
     def relation_list_query(schema, kind: nil)
-      kind_sql_list = "'" + (kind.nil? ? %w(r v m) : Array(kind).flatten).join("', '") + "'"
+      kind_sql_list = "'" + (kind.nil? ? %w(r f v m) : Array(kind).flatten).join("', '") + "'"
       %(
           select  relname
           from    pg_class 

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/pg_conn.rb

@@ -451,8 +451,7 @@ module PgConn
           raise ArgumentError, "Unrecognized value: #{arg.inspect}"
         end
       }.join(", ")
-      query = "select * from #{name}(#{args_sql})"
-      r = pg_exec(query)
+      r = pg_exec "select * from #{name}(#{args_sql})"
       if r.ntuples == 0
         raise Error, "No records returned"
       elsif r.ntuples == 1
@@ -478,7 +477,7 @@ module PgConn
     # fail is false #exec instead return nil but note that postgres doesn't
     # ignore it so that if you're inside a transaction, the transaction will be
     # in an error state and if you're also using subtransactions the whole
-    # transaction stack collapses.
+    # transaction stack has collapsed
     #
     # TODO: Make sure the transaction stack is emptied on postgres errors
     def exec(sql, commit: true, fail: true, silent: false)
@@ -583,6 +582,7 @@ module PgConn
       rescue PgConn::Rollback
         pop_trancaction(commit: false)
         return nil
+      # FIXME: Rescue other postgres errors and wipe-out stack
       end
       pop_transaction(commit: commit)
       result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_conn
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gem pg_conn