aurora-dsql-ruby-pg 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0af7ba782ac3c43e13044ec8ef592bf162fae89aabba8228747542d80e1eb79b
-  data.tar.gz: 8fcb277ac218333d5835dcca93628f3897c59770409f09970cd4ec4d6d193c86
+  metadata.gz: ec5cb524ab6a027a0de03dcde02ce0fbf4f78500bc95a29c125effad05919a77
+  data.tar.gz: 0a439698df60a0cbead79acbc54a6dda99ecdc60b2bcff497acef51badb6cf35
 SHA512:
-  metadata.gz: 8a5478e20f6359ec8b5641a2f075711b0a8c642614c8d891f7d258b0a19f3bcb5fdb5e466e8032685a59eb0228f03733d6e2f250291191de1766b83fe4426fbd
-  data.tar.gz: f73b1322c292ae87a9583636246a3e1b7d9e1a78caf7b301efe7afd070e9cd7852cc5eb3f45da255af2a2c20ab5d9d0ba542303b64e5ab8357003b93ddb5c8b7
+  metadata.gz: 5ab34f0bafb57cc66f3e987d8a94f0005f226e6f4e3cf9ddc17c152b4dc7c0b54bbac8258073b8152fdc7a60fa3b29807f718d5381c96d8819cc1712621c0f78
+  data.tar.gz: 5bc9d25804798be0c2c1d9066f0d09ca6d80e514e416fd45e762867e4bb0b329386f84484a89686d9bfa5a1597a189572f27d3e9c87a976f6b705c83a2f28c11

data/README.md

@@ -87,13 +87,22 @@ pool.shutdown
 | `profile` | `String` | `nil` | AWS profile name |
 | `token_duration` | `Integer` | `900` (15 min) | Token validity in seconds |
 | `credentials_provider` | `Aws::Credentials` | `nil` | Custom credentials |
-| `pool_size` | `Integer` | `5` | Connection pool size |
-| `checkout_timeout` | `Integer` | `5` | Seconds to wait for a pool connection |
 | `max_lifetime` | `Integer` | `3300` (55 min) | Max connection lifetime in seconds |
 | `application_name` | `String` | `nil` | ORM prefix for application_name |
 | `logger` | `Logger` | `nil` | Logger for OCC retry warnings |
 | `occ_max_retries` | `Integer` | `nil` (disabled) | Max OCC retries on `pool.with`; enables retry when set |
 
+### Pool Options
+
+`create_pool` accepts a `pool:` keyword with a hash of options passed directly to [`ConnectionPool.new`](https://github.com/mperham/connection_pool). Defaults: `{size: 5, timeout: 5}`.
+
+```ruby
+pool = AuroraDsql::Pg.create_pool(
+  host: "your-cluster.dsql.us-east-1.on.aws",
+  pool: { size: 10, timeout: 10 }
+)
+```
+
 ## Connection String Format
 
 ```ruby
@@ -110,7 +119,7 @@ conn.exec("SELECT 1")
 conn.close
 ```
 
-The `Connection` wrapper delegates common methods (`exec_params`, `query`, `transaction`, `close`, `finished?`) directly. All other `PG::Connection` methods (e.g., `exec`, `prepare`, `exec_prepared`, `copy_data`) are also available via delegation. The underlying `PG::Connection` can be accessed directly via `conn.pg_conn` if needed.
+`connect` returns a standard `PG::Connection`.
 
 ## OCC Retry
 

data/lib/aurora_dsql/pg/config.rb

@@ -12,15 +12,12 @@ module AuroraDsql
         database: "postgres",
         port: 5432,
         max_lifetime: 55 * 60,      # 55 minutes in seconds
-        token_duration: 15 * 60,    # 15 minutes in seconds
-        pool_size: 5,
-        checkout_timeout: 5         # seconds to wait for a pool connection
+        token_duration: 15 * 60    # 15 minutes in seconds
       }.freeze
 
       attr_accessor :host, :region, :user, :database, :port,
                     :profile, :token_duration, :credentials_provider,
-                    :max_lifetime, :pool_size, :checkout_timeout,
-                    :application_name, :logger, :occ_max_retries
+                    :max_lifetime, :application_name, :logger, :occ_max_retries
 
       def initialize(**options)
         @host = options[:host]
@@ -32,8 +29,6 @@ module AuroraDsql
         @token_duration = options[:token_duration]
         @credentials_provider = options[:credentials_provider]
         @max_lifetime = options[:max_lifetime]
-        @pool_size = options[:pool_size]
-        @checkout_timeout = options[:checkout_timeout]
         @application_name = options[:application_name]
         @logger = options[:logger]
         @occ_max_retries = options[:occ_max_retries]
@@ -100,8 +95,6 @@ module AuroraDsql
           token_duration: @token_duration || DEFAULTS[:token_duration],
           credentials_provider: @credentials_provider,
           max_lifetime: @max_lifetime || DEFAULTS[:max_lifetime],
-          pool_size: @pool_size || DEFAULTS[:pool_size],
-          checkout_timeout: @checkout_timeout || DEFAULTS[:checkout_timeout],
           application_name: @application_name,
           logger: @logger,
           occ_max_retries: @occ_max_retries
@@ -132,11 +125,6 @@ module AuroraDsql
       def validate!
         raise Error, "host is required" if @host.nil? || @host.empty?
 
-        if @port
-          raise Error, "port must be an integer, got #{@port.class}" unless @port.is_a?(Integer)
-          raise Error, "port must be between 1 and 65535, got #{@port}" if @port < 1 || @port > 65_535
-        end
-
         if @occ_max_retries
           unless @occ_max_retries.is_a?(Integer) && @occ_max_retries > 0
             raise Error, "occ_max_retries must be a positive integer, got #{@occ_max_retries.inspect}"
@@ -149,8 +137,7 @@ module AuroraDsql
     ResolvedConfig = Struct.new(
       :host, :region, :user, :database, :port,
       :profile, :token_duration, :credentials_provider,
-      :max_lifetime, :pool_size, :checkout_timeout,
-      :application_name, :logger, :occ_max_retries,
+      :max_lifetime, :application_name, :logger, :occ_max_retries,
       keyword_init: true
     ) do
       # Convert to pg connection parameters hash.

data/lib/aurora_dsql/pg/pool.rb

@@ -11,18 +11,18 @@ module AuroraDsql
       # Wrapper to track connection creation time for max_lifetime enforcement.
       PooledConnection = Struct.new(:conn, :created_at, keyword_init: true)
 
+      POOL_DEFAULTS = { size: 5, timeout: 5 }.freeze
+
       # Create a new connection pool.
-      def self.create(config = nil, **options)
-        new(Config.from(config, **options).resolve)
+      def self.create(config = nil, pool: {}, **options)
+        new(Config.from(config, **options).resolve, pool)
       end
 
-      def initialize(resolved_config)
+      def initialize(resolved_config, pool_options = {})
         @config = resolved_config
 
-        @pool = ConnectionPool.new(
-          size: resolved_config.pool_size,
-          timeout: resolved_config.checkout_timeout
-        ) { create_connection }
+        effective_pool = POOL_DEFAULTS.merge(pool_options)
+        @pool = ConnectionPool.new(**effective_pool) { create_connection }
       end
 
       # Maximum stale connection discards before giving up.

data/lib/aurora_dsql/pg/version.rb

@@ -3,7 +3,7 @@
 
 module AuroraDsql
   module Pg
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
     APPLICATION_NAME = "aurora-dsql-ruby-pg/#{VERSION}"
 
     # Build application_name with optional ORM prefix.

data/lib/aurora_dsql_pg.rb

@@ -5,7 +5,6 @@ require_relative "aurora_dsql/pg/version"
 require_relative "aurora_dsql/pg/util"
 require_relative "aurora_dsql/pg/config"
 require_relative "aurora_dsql/pg/token"
-require_relative "aurora_dsql/pg/connection"
 require_relative "aurora_dsql/pg/pool"
 require_relative "aurora_dsql/pg/occ_retry"
 
@@ -14,13 +13,21 @@ module AuroraDsql
     class Error < StandardError; end
 
     # Create a single connection to Aurora DSQL.
+    # Returns a PG::Connection.
     def self.connect(config = nil, **options)
-      Connection.connect(config, **options)
+      resolved = Config.from(config, **options).resolve
+      token = Token.generate(
+        host: resolved.host, region: resolved.region,
+        user: resolved.user, credentials: resolved.credentials_provider,
+        profile: resolved.profile, expires_in: resolved.token_duration
+      )
+      PG.connect(resolved.to_pg_params(password: token))
     end
 
     # Create a connection pool for Aurora DSQL.
-    def self.create_pool(config = nil, **options)
-      Pool.create(config, **options)
+    # Pass pool: { size: N, timeout: N } to configure ConnectionPool.
+    def self.create_pool(config = nil, pool: {}, **options)
+      Pool.create(config, pool: pool, **options)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aurora-dsql-ruby-pg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-09 00:00:00.000000000 Z
+date: 2026-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -98,7 +98,6 @@ files:
 - NOTICE
 - README.md
 - lib/aurora_dsql/pg/config.rb
-- lib/aurora_dsql/pg/connection.rb
 - lib/aurora_dsql/pg/occ_retry.rb
 - lib/aurora_dsql/pg/pool.rb
 - lib/aurora_dsql/pg/token.rb

data/lib/aurora_dsql/pg/connection.rb

@@ -1,72 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-require "pg"
-
-module AuroraDsql
-  module Pg
-    # Single connection wrapper for Aurora DSQL.
-    class Connection
-      attr_reader :pg_conn, :config
-
-      # Create a new connection to Aurora DSQL.
-      def self.connect(config = nil, **options)
-        resolved = Config.from(config, **options).resolve
-
-        token = Token.generate(
-          host: resolved.host,
-          region: resolved.region,
-          user: resolved.user,
-          credentials: resolved.credentials_provider,
-          profile: resolved.profile,
-          expires_in: resolved.token_duration
-        )
-
-        pg_conn = ::PG.connect(resolved.to_pg_params(password: token))
-        new(pg_conn, resolved)
-      end
-
-      def initialize(pg_conn, config)
-        @pg_conn = pg_conn
-        @config = config
-      end
-
-      # Delegate common pg methods
-
-      def exec_params(...)
-        @pg_conn.exec_params(...)
-      end
-
-      def query(...)
-        @pg_conn.query(...)
-      end
-
-      def transaction(...)
-        @pg_conn.transaction(...)
-      end
-
-      def close
-        @pg_conn.close
-      end
-
-      def finished?
-        @pg_conn.finished?
-      end
-
-      private
-
-      # Delegate remaining methods to PG::Connection.
-      def method_missing(method, ...)
-        if @pg_conn.respond_to?(method)
-          @pg_conn.send(method, ...)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        @pg_conn.respond_to?(method, include_private) || super
-      end
-    end
-  end
-end