activerecord-cipherstash-pg-adapter 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b22c3a2c87a993eaf0833dd013954e25925e6675cec8ff40798ad4ee932db0e
-  data.tar.gz: fc7ed2b4e78b808d1e0618a4d2db0897dd053ff022115037f46035bbd2afa8e4
+  metadata.gz: 662a206227829df410fe299405dd9b1fff2d62b879998fb8f29f59bcc88d8baa
+  data.tar.gz: 638a5f17b08d880a3ac7fd671905f6d3a42f95d0bdcd0bcd3564422435ae6b9b
 SHA512:
-  metadata.gz: 077cb9e80c55e8ec7f8677e273cdab265ac32eae95270cdbed7f6805591f793bb7482d51b288029dc8365b5f52d58405f7c69606464351ef3d014e582bbd6c18
-  data.tar.gz: c4da8c6e9f12e0fa96c4a5c32a78bdc3f3028d27e189062971c5db4e0730bbe823690cd4ed80f332c5f335bd5294003e43d4e054f29ba38d5d3ce4db2dc147e6
+  metadata.gz: 39fecf791d8bee80a099b108c84284c8bc8a1d748089256152eb35858df3b8d5150394bb19f5f13ea6c76b2d50c1dab033afd37d13ba4b4e54281c279c374d09
+  data.tar.gz: 8f34eeaa73a3f58c23ac15655d11f76e79073768ca096c0722dee1ca56ac64974e09d460739867a6d2982e2c8c1c5028ae44719330905145978d1b004220efb7

data/CHANGELOG.md

@@ -1,5 +1,28 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
 ## [Unreleased]
 
+## [0.7.1] - 2023-05-02
+
+### Changed
+
+- Bump version of cipherstash-pg.
+
+### Fixed
+
+- Fix module names in ActiveRecord 6 adapter
+
+## [0.7.0] - 2023-05-01
+
+### Changed
+
+- Update PG namespace to use CipherStashPG.
+- Bump version of cipherstash-pg.
+
 ## [0.6.1] - 2023-04-26
 
 ### Fixed
@@ -33,6 +56,7 @@
 - Bump version of cipherstash-pg.
 
 ## [0.3.0] - 2023-04-04
+
 ### Added
 
 - Support for both Rails 6 + 7.

data/README.md

@@ -26,7 +26,12 @@ development:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version:
+
+- update the version number in `version.rb`.
+- update the CHANGELOG.
+- raise a PR and merge.
+- run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 In the github repo:
 

data/activerecord-cipherstash-pg-adapter.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
 
   # Runtime dependencies here; dev+test go in Gemfile.
   spec.add_dependency "activerecord", ">= 6.0.0", "< 8.0.0"
-  spec.add_dependency "cipherstash-pg", ">= 1.0.0.beta.1"
+  spec.add_dependency "cipherstash-pg", ">= 1.0.0.beta.4"
 end

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/database_statements.rb

@@ -32,9 +32,9 @@ module ActiveRecord
           !READ_QUERY.match?(sql.b)
         end
 
-        # Executes an SQL statement, returning a PG::Result object on success
-        # or raising a PG::Error exception otherwise.
-        # Note: the PG::Result object is manually memory managed; if you don't
+        # Executes an SQL statement, returning a ::CipherStashPG::Result object on success
+        # or raising a ::CipherStashPG::Error exception otherwise.
+        # Note: the ::CipherStashPG::Result object is manually memory managed; if you don't
         # need it specifically, you may want consider the <tt>exec_query</tt> wrapper.
         def execute(sql, name = nil)
           if preventing_writes? && write_query?(sql)

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/oid/array.rb

@@ -16,8 +16,8 @@ module ActiveRecord
             @subtype = subtype
             @delimiter = delimiter
 
-            @pg_encoder = PG::TextEncoder::Array.new name: "#{type}[]", delimiter: delimiter
-            @pg_decoder = PG::TextDecoder::Array.new name: "#{type}[]", delimiter: delimiter
+            @pg_encoder = ::CipherStashPG::TextEncoder::Array.new name: "#{type}[]", delimiter: delimiter
+            @pg_decoder = ::CipherStashPG::TextDecoder::Array.new name: "#{type}[]", delimiter: delimiter
           end
 
           def deserialize(value)

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/oid/bytea.rb

@@ -8,7 +8,7 @@ module ActiveRecord
           def deserialize(value)
             return if value.nil?
             return value.to_s if value.is_a?(Type::Binary::Data)
-            PG::Connection.unescape_bytea(super)
+            ::CipherStashPG::Connection.unescape_bytea(super)
           end
         end
       end

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/quoting.rb

@@ -35,7 +35,7 @@ module ActiveRecord
 
         # Quotes schema names for use in SQL queries.
         def quote_schema_name(name)
-          PG::Connection.quote_ident(name)
+          ::CipherStashPG::Connection.quote_ident(name)
         end
 
         def quote_table_name_for_assignment(table, attr)
@@ -44,7 +44,7 @@ module ActiveRecord
 
         # Quotes column names for use in SQL queries.
         def quote_column_name(name) # :nodoc:
-          self.class.quoted_column_names[name] ||= PG::Connection.quote_ident(super).freeze
+          self.class.quoted_column_names[name] ||= ::CipherStashPG::Connection.quote_ident(super).freeze
         end
 
         # Quote date/time values for use in SQL input.

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/schema_statements.rb

@@ -589,7 +589,7 @@ module ActiveRecord
         end
 
         def update_table_definition(table_name, base) # :nodoc:
-          CipherStashPG::Table.new(table_name, base)
+          ::CipherStashPG::Table.new(table_name, base)
         end
 
         def create_schema_dumper(options) # :nodoc:

data/lib/active_record/connection_adapters/6.1/cipherstash_pg/utils.rb

@@ -21,9 +21,9 @@ module ActiveRecord
 
         def quoted
           if schema
-            PG::Connection.quote_ident(schema) << SEPARATOR << PG::Connection.quote_ident(identifier)
+            ::CipherStashPG::Connection.quote_ident(schema) << SEPARATOR << ::CipherStashPG::Connection.quote_ident(identifier)
           else
-            PG::Connection.quote_ident(identifier)
+            ::CipherStashPG::Connection.quote_ident(identifier)
           end
         end
 

data/lib/active_record/connection_adapters/6.1/postgres_cipherstash_adapter.rb

@@ -38,8 +38,8 @@ module ActiveRecord
       conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
       conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-      # Forward only valid config params to PG::Connection.connect.
-      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      # Forward only valid config params to ::CipherStashPG::Connection.connect.
+      valid_conn_param_keys = ::CipherStashPG::Connection.conndefaults_hash.keys + [:requiressl]
       conn_params.slice!(*valid_conn_param_keys)
 
       ConnectionAdapters::CipherStashPGAdapter.new(
@@ -57,8 +57,8 @@ module ActiveRecord
 
       class << self
         def new_client(conn_params)
-          PG.connect(**conn_params)
-        rescue ::PG::Error => error
+        ::CipherStashPG.connect(**conn_params)
+        rescue ::CipherStashPG::Error => error
           if conn_params && conn_params[:dbname] && error.message.include?(conn_params[:dbname])
             raise ActiveRecord::NoDatabaseError
           else
@@ -215,12 +215,12 @@ module ActiveRecord
         private
           def dealloc(key)
             @connection.query "DEALLOCATE #{key}" if connection_active?
-          rescue PG::Error
+          rescue ::CipherStashPG::Error
           end
 
           def connection_active?
-            @connection.status == PG::CONNECTION_OK
-          rescue PG::Error
+            @connection.status == ::CipherStashPG::CONNECTION_OK
+          rescue ::CipherStashPG::Error
             false
           end
       end
@@ -257,7 +257,7 @@ module ActiveRecord
           @connection.query "SELECT 1"
         end
         true
-      rescue PG::Error
+      rescue ::CipherStashPG::Error
         false
       end
 
@@ -267,7 +267,7 @@ module ActiveRecord
           super
           @connection.reset
           configure_connection
-        rescue PG::ConnectionBad
+        rescue ::CipherStashPG::ConnectionBad
           connect
         end
       end
@@ -276,7 +276,7 @@ module ActiveRecord
         @lock.synchronize do
           clear_cache!
           reset_transaction
-          unless @connection.transaction_status == ::PG::PQTRANS_IDLE
+          unless @connection.transaction_status == ::CipherStashPG::PQTRANS_IDLE
             @connection.query "ROLLBACK"
           end
           @connection.query "DISCARD ALL"
@@ -450,7 +450,7 @@ module ActiveRecord
         def translate_exception(exception, message:, sql:, binds:)
           return exception unless exception.respond_to?(:result)
 
-          case exception.result.try(:error_field, PG::PG_DIAG_SQLSTATE)
+          case exception.result.try(:error_field, ::CipherStashPG::PG_DIAG_SQLSTATE)
           when nil
             if exception.message.match?(/connection is closed/i)
               ConnectionNotEstablished.new(exception)
@@ -550,7 +550,7 @@ module ActiveRecord
             # places before decimal = (fmod - 4) >> 16 & 0xffff
             if fmod && (fmod - 4 & 0xffff).zero?
               # FIXME: Remove this class, and the second argument to
-              # lookups on PG
+              # lookups on ::CipherStashPG
               Type::DecimalWithoutScale.new(precision: precision)
             else
               OID::Decimal.new(precision: precision, scale: scale)
@@ -704,8 +704,8 @@ module ActiveRecord
         # https://git.cipherstash_pg.org/gitweb/?p=cipherstash_pg.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
         def is_cached_plan_failure?(e)
           pgerror = e.cause
-          pgerror.result.result_error_field(PG::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
-            pgerror.result.result_error_field(PG::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
+          pgerror.result.result_error_field(::CipherStashPG::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
+            pgerror.result.result_error_field(::CipherStashPG::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
         rescue
           false
         end
@@ -870,18 +870,18 @@ module ActiveRecord
         end
 
         def add_pg_encoders
-          map = PG::TypeMapByClass.new
-          map[Integer] = PG::TextEncoder::Integer.new
-          map[TrueClass] = PG::TextEncoder::Boolean.new
-          map[FalseClass] = PG::TextEncoder::Boolean.new
+          map = ::CipherStashPG::TypeMapByClass.new
+          map[Integer] = ::CipherStashPG::TextEncoder::Integer.new
+          map[TrueClass] = ::CipherStashPG::TextEncoder::Boolean.new
+          map[FalseClass] = ::CipherStashPG::TextEncoder::Boolean.new
           @connection.type_map_for_queries = map
         end
 
         def update_typemap_for_default_timezone
           if @default_timezone != ActiveRecord::Base.default_timezone && @timestamp_decoder
             decoder_class = ActiveRecord::Base.default_timezone == :utc ?
-              PG::TextDecoder::TimestampUtc :
-              PG::TextDecoder::TimestampWithoutTimeZone
+              ::CipherStashPG::TextDecoder::TimestampUtc :
+              ::CipherStashPG::TextDecoder::TimestampWithoutTimeZone
 
             @timestamp_decoder = decoder_class.new(@timestamp_decoder.to_h)
             @connection.type_map_for_results.add_coder(@timestamp_decoder)
@@ -894,16 +894,16 @@ module ActiveRecord
           @timestamp_decoder = nil
 
           coders_by_name = {
-            "int2" => PG::TextDecoder::Integer,
-            "int4" => PG::TextDecoder::Integer,
-            "int8" => PG::TextDecoder::Integer,
-            "oid" => PG::TextDecoder::Integer,
-            "float4" => PG::TextDecoder::Float,
-            "float8" => PG::TextDecoder::Float,
-            "numeric" => PG::TextDecoder::Numeric,
-            "bool" => PG::TextDecoder::Boolean,
-            "timestamp" => PG::TextDecoder::TimestampUtc,
-            "timestamptz" => PG::TextDecoder::TimestampWithTimeZone,
+            "int2" => ::CipherStashPG::TextDecoder::Integer,
+            "int4" => ::CipherStashPG::TextDecoder::Integer,
+            "int8" => ::CipherStashPG::TextDecoder::Integer,
+            "oid" => ::CipherStashPG::TextDecoder::Integer,
+            "float4" => ::CipherStashPG::TextDecoder::Float,
+            "float8" => ::CipherStashPG::TextDecoder::Float,
+            "numeric" => ::CipherStashPG::TextDecoder::Numeric,
+            "bool" => ::CipherStashPG::TextDecoder::Boolean,
+            "timestamp" => ::CipherStashPG::TextDecoder::TimestampUtc,
+            "timestamptz" => ::CipherStashPG::TextDecoder::TimestampWithTimeZone,
           }
 
           known_coder_types = coders_by_name.keys.map { |n| quote(n) }
@@ -918,13 +918,13 @@ module ActiveRecord
               .compact
           end
 
-          map = PG::TypeMapByOid.new
+          map = ::CipherStashPG::TypeMapByOid.new
           coders.each { |coder| map.add_coder(coder) }
           @connection.type_map_for_results = map
 
-          @type_map_for_results = PG::TypeMapByOid.new
+          @type_map_for_results = ::CipherStashPG::TypeMapByOid.new
           @type_map_for_results.default_type_map = map
-          @type_map_for_results.add_coder(PG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
+          @type_map_for_results.add_coder(::CipherstashPG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
           @type_map_for_results.add_coder(MoneyDecoder.new(oid: 790, name: "money"))
 
           # extract timestamp decoder for use in update_typemap_for_default_timezone
@@ -937,7 +937,7 @@ module ActiveRecord
           coder_class.new(oid: row["oid"].to_i, name: row["typname"])
         end
 
-        class MoneyDecoder < PG::SimpleDecoder # :nodoc:
+        class MoneyDecoder < ::CipherstashPG::SimpleDecoder # :nodoc:
           TYPE = OID::Money.new
 
           def decode(value, tuple = nil, field = nil)

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/database_statements.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       module DatabaseStatements
         def explain(arel, binds = [])
           sql = "EXPLAIN #{to_sql(arel, binds)}"
-          CipherStashPG::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", binds))
+          ::CipherStashPG::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", binds))
         end
 
         # Queries the database and returns the results in an Array-like object
@@ -32,9 +32,9 @@ module ActiveRecord
           !READ_QUERY.match?(sql.b)
         end
 
-        # Executes an SQL statement, returning a PG::Result object on success
-        # or raising a PG::Error exception otherwise.
-        # Note: the PG::Result object is manually memory managed; if you don't
+        # Executes an SQL statement, returning a ::CipherStashPG::Result object on success
+        # or raising a ::CipherStashPG::Error exception otherwise.
+        # Note: the ::CipherStashPG::Result object is manually memory managed; if you don't
         # need it specifically, you may want consider the <tt>exec_query</tt> wrapper.
         def execute(sql, name = nil)
           sql = transform_query(sql)

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/oid/array.rb

@@ -16,8 +16,8 @@ module ActiveRecord
             @subtype = subtype
             @delimiter = delimiter
 
-            @pg_encoder = PG::TextEncoder::Array.new name: "#{type}[]", delimiter: delimiter
-            @pg_decoder = PG::TextDecoder::Array.new name: "#{type}[]", delimiter: delimiter
+            @pg_encoder = ::CipherStashPG::TextEncoder::Array.new name: "#{type}[]", delimiter: delimiter
+            @pg_decoder = ::CipherStashPG::TextDecoder::Array.new name: "#{type}[]", delimiter: delimiter
           end
 
           def deserialize(value)

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/oid/bytea.rb

@@ -8,7 +8,7 @@ module ActiveRecord
           def deserialize(value)
             return if value.nil?
             return value.to_s if value.is_a?(Type::Binary::Data)
-            PG::Connection.unescape_bytea(super)
+            ::CipherStashPG::Connection.unescape_bytea(super)
           end
         end
       end

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/quoting.rb

@@ -86,7 +86,7 @@ module ActiveRecord
 
         # Quotes schema names for use in SQL queries.
         def quote_schema_name(name)
-          PG::Connection.quote_ident(name)
+          ::CipherStashPG::Connection.quote_ident(name)
         end
 
         def quote_table_name_for_assignment(table, attr)
@@ -95,7 +95,7 @@ module ActiveRecord
 
         # Quotes column names for use in SQL queries.
         def quote_column_name(name) # :nodoc:
-          self.class.quoted_column_names[name] ||= PG::Connection.quote_ident(super).freeze
+          self.class.quoted_column_names[name] ||= ::CipherStashPG::Connection.quote_ident(super).freeze
         end
 
         # Quote date/time values for use in SQL input.

data/lib/active_record/connection_adapters/7.0/cipherstash_pg/utils.rb

@@ -21,9 +21,9 @@ module ActiveRecord
 
         def quoted
           if schema
-            PG::Connection.quote_ident(schema) << SEPARATOR << PG::Connection.quote_ident(identifier)
+            ::CipherStashPG::Connection.quote_ident(schema) << SEPARATOR << ::CipherStashPG::Connection.quote_ident(identifier)
           else
-            PG::Connection.quote_ident(identifier)
+            ::CipherStashPG::Connection.quote_ident(identifier)
           end
         end
 

data/lib/active_record/connection_adapters/7.0/postgres_cipherstash_adapter.rb

@@ -39,8 +39,8 @@ module ActiveRecord
       conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
       conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-      # Forward only valid config params to PG::Connection.connect.
-      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      # Forward only valid config params to ::CipherStashPG::Connection.connect.
+      valid_conn_param_keys = ::CipherStashPG::Connection.conndefaults_hash.keys + [:requiressl]
       conn_params.slice!(*valid_conn_param_keys)
 
       ConnectionAdapters::CipherStashPGAdapter.new(
@@ -58,8 +58,8 @@ module ActiveRecord
 
       class << self
         def new_client(conn_params)
-          PG.connect(**conn_params)
-        rescue ::PG::Error => error
+        ::CipherStashPG.connect(**conn_params)
+        rescue ::CipherStashPG::Error => error
           if conn_params && conn_params[:dbname] && error.message.include?(conn_params[:dbname])
             raise ActiveRecord::NoDatabaseError.db_error(conn_params[:dbname])
           elsif conn_params && conn_params[:user] && error.message.include?(conn_params[:user])
@@ -250,12 +250,12 @@ module ActiveRecord
         private
           def dealloc(key)
             @connection.query "DEALLOCATE #{key}" if connection_active?
-          rescue PG::Error
+          rescue ::CipherStashPG::Error
           end
 
           def connection_active?
-            @connection.status == PG::CONNECTION_OK
-          rescue PG::Error
+            @connection.status == ::CipherStashPG::CONNECTION_OK
+          rescue ::CipherStashPG::Error
             false
           end
       end
@@ -292,7 +292,7 @@ module ActiveRecord
           @connection.query ";"
         end
         true
-      rescue PG::Error
+      rescue ::CipherStashPG::Error
         false
       end
 
@@ -308,7 +308,7 @@ module ActiveRecord
           @connection.reset
           configure_connection
           reload_type_map
-        rescue PG::ConnectionBad
+        rescue ::CipherStashPG::ConnectionBad
           connect
         end
       end
@@ -317,7 +317,7 @@ module ActiveRecord
         @lock.synchronize do
           clear_cache!
           reset_transaction
-          unless @connection.transaction_status == ::PG::PQTRANS_IDLE
+          unless @connection.transaction_status == ::CipherStashPG::PQTRANS_IDLE
             @connection.query "ROLLBACK"
           end
           @connection.query "DISCARD ALL"
@@ -666,7 +666,7 @@ module ActiveRecord
         def translate_exception(exception, message:, sql:, binds:)
           return exception unless exception.respond_to?(:result)
 
-          case exception.result.try(:error_field, PG::PG_DIAG_SQLSTATE)
+          case exception.result.try(:error_field, ::CipherStashPG::PG_DIAG_SQLSTATE)
           when nil
             if exception.message.match?(/connection is closed/i)
               ConnectionNotEstablished.new(exception)
@@ -810,8 +810,8 @@ module ActiveRecord
         # https://git.cipherstash_pg.org/gitweb/?p=cipherstash_pg.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
         def is_cached_plan_failure?(e)
           pgerror = e.cause
-          pgerror.result.result_error_field(PG::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
-            pgerror.result.result_error_field(PG::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
+          pgerror.result.result_error_field(::CipherStashPG::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
+            pgerror.result.result_error_field(::CipherStashPG::PG_DIAG_SOURCE_FUNCTION) == "RevalidateCachedQuery"
         rescue
           false
         end
@@ -976,18 +976,18 @@ module ActiveRecord
         end
 
         def add_pg_encoders
-          map = PG::TypeMapByClass.new
-          map[Integer] = PG::TextEncoder::Integer.new
-          map[TrueClass] = PG::TextEncoder::Boolean.new
-          map[FalseClass] = PG::TextEncoder::Boolean.new
+          map = ::CipherStashPG::TypeMapByClass.new
+          map[Integer] = ::CipherStashPG::TextEncoder::Integer.new
+          map[TrueClass] = ::CipherStashPG::TextEncoder::Boolean.new
+          map[FalseClass] = ::CipherStashPG::TextEncoder::Boolean.new
           @connection.type_map_for_queries = map
         end
 
         def update_typemap_for_default_timezone
           if @default_timezone != ActiveRecord.default_timezone && @timestamp_decoder
             decoder_class = ActiveRecord.default_timezone == :utc ?
-              PG::TextDecoder::TimestampUtc :
-              PG::TextDecoder::TimestampWithoutTimeZone
+              ::CipherStashPG::TextDecoder::TimestampUtc :
+              ::CipherStashPG::TextDecoder::TimestampWithoutTimeZone
 
             @timestamp_decoder = decoder_class.new(@timestamp_decoder.to_h)
             @connection.type_map_for_results.add_coder(@timestamp_decoder)
@@ -1005,16 +1005,16 @@ module ActiveRecord
           @timestamp_decoder = nil
 
           coders_by_name = {
-            "int2" => PG::TextDecoder::Integer,
-            "int4" => PG::TextDecoder::Integer,
-            "int8" => PG::TextDecoder::Integer,
-            "oid" => PG::TextDecoder::Integer,
-            "float4" => PG::TextDecoder::Float,
-            "float8" => PG::TextDecoder::Float,
-            "numeric" => PG::TextDecoder::Numeric,
-            "bool" => PG::TextDecoder::Boolean,
-            "timestamp" => PG::TextDecoder::TimestampUtc,
-            "timestamptz" => PG::TextDecoder::TimestampWithTimeZone,
+            "int2" => ::CipherStashPG::TextDecoder::Integer,
+            "int4" => ::CipherStashPG::TextDecoder::Integer,
+            "int8" => ::CipherStashPG::TextDecoder::Integer,
+            "oid" => ::CipherStashPG::TextDecoder::Integer,
+            "float4" => ::CipherStashPG::TextDecoder::Float,
+            "float8" => ::CipherStashPG::TextDecoder::Float,
+            "numeric" => ::CipherStashPG::TextDecoder::Numeric,
+            "bool" => ::CipherStashPG::TextDecoder::Boolean,
+            "timestamp" => ::CipherStashPG::TextDecoder::TimestampUtc,
+            "timestamptz" => ::CipherStashPG::TextDecoder::TimestampWithTimeZone,
           }
 
           known_coder_types = coders_by_name.keys.map { |n| quote(n) }
@@ -1027,13 +1027,13 @@ module ActiveRecord
             result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
           end
 
-          map = PG::TypeMapByOid.new
+          map = ::CipherStashPG::TypeMapByOid.new
           coders.each { |coder| map.add_coder(coder) }
           @connection.type_map_for_results = map
 
-          @type_map_for_results = PG::TypeMapByOid.new
+          @type_map_for_results = ::CipherStashPG::TypeMapByOid.new
           @type_map_for_results.default_type_map = map
-          @type_map_for_results.add_coder(PG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
+          @type_map_for_results.add_coder(::CipherStashPG::TextDecoder::Bytea.new(oid: 17, name: "bytea"))
           @type_map_for_results.add_coder(MoneyDecoder.new(oid: 790, name: "money"))
 
           # extract timestamp decoder for use in update_typemap_for_default_timezone
@@ -1046,7 +1046,7 @@ module ActiveRecord
           coder_class.new(oid: row["oid"].to_i, name: row["typname"])
         end
 
-        class MoneyDecoder < PG::SimpleDecoder # :nodoc:
+        class MoneyDecoder < ::CipherStashPG::SimpleDecoder # :nodoc:
           TYPE = OID::Money.new
 
           def decode(value, tuple = nil, field = nil)

data/lib/active_record/connection_adapters/cipherstash_pg/database_extensions.rb

@@ -8,7 +8,7 @@ module ActiveRecord
           logger.info("Installing database extension.....")
 
           ActiveRecord::Base.connection.execute(
-            ::CipherStash::PG.install_script
+            ::CipherStashPG.install_script
           )
 
           logger.info("Database extension installed.")
@@ -18,7 +18,7 @@ module ActiveRecord
           logger.info("Uninstalling database extension.....")
 
           ActiveRecord::Base.connection.execute(
-            ::CipherStash::PG.uninstall_script
+            ::CipherStashPG.uninstall_script
           )
 
           logger.info("Database extension uninstalled.")

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecord
-  CIPHERSTASH_PG_ADAPTER_VERSION = "0.6.1"
+  CIPHERSTASH_PG_ADAPTER_VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cipherstash-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Robin Howard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.4
 description: CipherStash PostgreSQL adapter for ActiveRecord.
 email:
 - robin@cipherstash.com