pg_conn 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb72128df77cad4c2a3e5992f2d72a727af4b57fc898b8c2f7102ebd8df7ebd
-  data.tar.gz: ced62377173f5c33d428bec72c321a934947b5f4a24cac8467ad0c0955131a32
+  metadata.gz: 8d9aafa29dec55b879562f1ee2925322ccbde2c829d1c23c0529d41c171210e4
+  data.tar.gz: de71188ab165e6c0d3b8d1d1e947e5ea9deb0615287da2467dfffa7ae048d910
 SHA512:
-  metadata.gz: 0becdbeef4a4feb64c550e03d167143f59dda2a6eb986119eababab944cb22fefd36b13fd6fe2a4ea2866c8297bf2000f8683a3a86a47753a3cd462f214e007f
-  data.tar.gz: 829f2be06bfe9a278544b5c909841c418e3b248e8287dad640f43c28039f2dfc3ad028052f435c20248187774ddbbcbdd1d6df412b6b1f52fd481d5b5bfa2ce8
+  metadata.gz: 7852a85c9a0b0ec2d31429a800cc1362e0c42d9a143cff80dfc47f81c2cad4fa3517777e91143f2a4876148b641a252d888e9316f53642af8f341772bce2bf8f
+  data.tar.gz: faf876c344f385b50f6813249114df1cec630ce85313517abb3e8a5a521524d14746fd58bed085cfc098298d0514bfa1c5bf17fa84fce0cb06790376a50699d4

data/lib/pg_conn/version.rb

@@ -1,3 +1,3 @@
 module PgConn
-  VERSION = "0.41.0"
+  VERSION = "0.42.0"
 end

data/lib/pg_conn.rb

@@ -887,12 +887,12 @@ module PgConn
           end
 
       # Execute SQL statement using either :value or :values depending on data arity
-      self.send method, %(
+      self.send method, <<~SQL
         insert into #{table} (#{quote_identifiers(fields)})
           values #{quote_tuples(tuples)}
           #{upsert_sql}
           returning id
-      )
+      SQL
     end
 
     # Use upsert. Currently only 'on conflict do nothing' is supported
@@ -1068,16 +1068,6 @@ module PgConn
 
     # TODO: Move to TransactionMethods
 
-    def commit()
-      if transaction?
-        pop_transaction(fail: false)
-      else
-        pg_exec("commit")
-      end
-    end
-
-    def rollback() raise Rollback end
-
     # True if a transaction is in progress
     #
     # Note that this requires all transactions to be started using PgConn's
@@ -1113,6 +1103,7 @@ module PgConn
       end
     end
 
+    # FIXME :exception is unused
     def pop_transaction(commit: true, fail: true, exception: true)
       if transaction?
         if savepoint = @savepoints.pop
@@ -1156,13 +1147,11 @@ module PgConn
 
     # Start a transaction. If called with a block, the block is executed within
     # a transaction that is auto-committed if the commit option is true (the
-    # default). #transaction returns the result of the block or nil if no block
-    # was given
-    #
-    # The transaction can be rolled back inside the block by raising a
-    # PgConn::Rollback exception in which case #transaction returns nil. Note
-    # that the transaction timestamp is set to the start of the first
-    # transaction even if transactions are nested
+    # default). The transaction is rolled back automatically if :commit is
+    # false or if a PgConn::Rollback is raised with the block. #transaction
+    # returns the result of the block or nil if no block was given. Note that
+    # the transaction timestamp is set to the start of the first transaction
+    # even if transactions are nested
     #
     # FIXME: There is some strange problem in rspec where #insert handles
     # an exception correctly while #exec, #execute, and #transaction does not
@@ -1187,6 +1176,19 @@ module PgConn
       end
     end
 
+    # The flow to global transactions is
+    #
+    #   conn.transaction # Starts a transaction
+    #   ...
+    #   if ok
+    #     conn.commit
+    #   else
+    #     conn.rollback
+    #   end
+    #
+    def commit() pop_transaction(fail: false) end
+    def rollback() pop_transaction(commit: false, fail: false) end
+
     def dump(*query)
       records = self.records(*query)
 
@@ -1264,7 +1266,18 @@ module PgConn
       datas = [datas] if !array
 
       pg_type = [schema_name, type].compact.join('.')
-      fields = self.values(%(
+#     fields = self.values(%(
+#       select attname
+#       from pg_attribute
+#       where
+#         attrelid = '#{pg_type}'::regclass
+#         and attnum > 0
+#         and not attisdropped
+#       order by attnum
+#     )).map(&:to_sym)
+
+
+      sql = <<~SQL
         select attname
         from pg_attribute
         where
@@ -1272,7 +1285,9 @@ module PgConn
           and attnum > 0
           and not attisdropped
         order by attnum
-      )).map(&:to_sym)
+      SQL
+
+      fields = self.values(sql).map(&:to_sym)
 
       literals = datas.map { |data|
         values =

metadata

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