quill-sql 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b78c0e2b82a49c007a604467d4c30ee9d57f0df37b7aa7b316fcdee1249f6a9
-  data.tar.gz: 3c519df47600372ab72b735ce5f0baf7402ebfc629b631b83a895823b1788c21
+  metadata.gz: 2a0a484270d6c53d3aace8649706262abc4025f036b2fcbe8b65e9f0e15d017e
+  data.tar.gz: 350c28eb59616ef2f23e23015fbb5c4909d01f90e218730e20b3cae48cd613ad
 SHA512:
-  metadata.gz: f2ae021a1248508de215150b14f8584dd4e2590e09551f1a104a40e42146cc5c77415ec8a481baed6929743f41e8e6aa469594159de2ab2ddc78af34518f4811
-  data.tar.gz: 0e91cf6e674aeb7db748f719d998bcaf3ad2fb7743723efb9588449ae63a77b3a53a1d6b25a7692f8d7ba71da23aac462b3fdc64840a9abfb4d345bbc46503d2
+  metadata.gz: c7952deda10956bebd8bbb43e6f5a38f1f58f2a488e8ca2d250a2b68b5bde1701f869f27e2e661461a19a7538994f5b3ca6104f6df820fb72ef607c8016afeeb
+  data.tar.gz: 94fddf190d5903b22b90d21f3f2f886592df35440d8babf4c499f59c8e57033834294acb02a8f6f4f1ec25484713981b489042540607cbba39cfd148a2691d0d

data/lib/db/postgres.rb

@@ -2,42 +2,76 @@ require 'pg'
 require 'json'
 require 'uri'
 require 'active_support/inflector'
+require 'connection_pool'
 
 module PostgresHelper
   class << self
     def connect_to_postgres(config)
-      conn = PG.connect(
-        host: config[:host],
-        port: config[:port],
-        dbname: config[:database],
-        user: config[:username],
-        password: config[:password],
-        sslmode: config[:sslmode] || 'prefer',
-        gssencmode: 'disable',  # Disable GSSAPI encryption
-        krbsrvname: nil,        # Disable Kerberos service name
-        target_session_attrs: 'read-write'
-      )
-      conn
+      # Create a connection pool that matches Puma's thread count
+      ConnectionPool.new(size: 5, timeout: 5) do
+        PG.connect(
+          host: config[:host],
+          port: config[:port],
+          dbname: config[:database],
+          user: config[:username],
+          password: config[:password],
+          sslmode: config[:sslmode] || 'prefer',
+          gssencmode: 'disable',  # Disable GSSAPI encryption
+          krbsrvname: nil,        # Disable Kerberos service name
+          target_session_attrs: 'read-write'
+        )
+      end
     end
 
-    def disconnect_from_postgres(client)
-      client.close if client.respond_to?(:close)
+    def disconnect_from_postgres(pool)
+      return unless pool.respond_to?(:shutdown)
+      pool.shutdown { |conn| conn.close if conn.respond_to?(:close) }
+    rescue PG::Error => e
+      puts "Error closing connection pool: #{e.message}"
     end
 
-    def run_query_postgres(sql, client)
-      result = client.exec(sql)
-      
-      fields = result.fields.map do |field|
+    def run_query_postgres(sql, pool)
+      pool.with do |client|
+        result = client.exec(sql)
+        
+        fields = result.fields.map do |field|
+          {
+            name: field,
+            dataTypeID: result.ftype(result.fields.index(field))
+          }
+        end
+
+        rows = result.values.map do |row|
+          result.fields.zip(row).map do |field_name, value|
+            # First convert all values to strings
+            string_value = value.to_s
+
+            # Then try to parse JSON if it looks like JSON
+            parsed_value = begin
+              if string_value.start_with?('[') || string_value.start_with?('{')
+                json_value = JSON.parse(string_value)
+                if json_value.is_a?(Array)
+                  json_value.map(&:to_s)
+                else
+                  json_value
+                end
+              else
+                string_value
+              end
+            rescue JSON::ParserError
+              string_value
+            end
+            [field_name, parsed_value]
+          end.to_h
+        end
+
         {
-          name: field,
-          dataTypeID: result.ftype(result.fields.index(field))
+          fields: fields,
+          rows: rows
         }
+      ensure
+        result&.clear if result.respond_to?(:clear)
       end
-
-      {
-        fields: fields,
-        rows: result.values.map { |row| result.fields.zip(row).to_h }
-      }
     end
 
     def get_schemas_postgres(client)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quill-sql
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shawn Magee, Albert Yan
 - Sam Bishop
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement