active_record_proxy_adapters 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 265cb32e99a265497548122846934c46405747109fa3bee34d1e2e66203b14a3
-  data.tar.gz: d9de3faf7274a0a94166637032c0a967e083edf55fc275b2456123d3f9a7ee79
+  metadata.gz: 2b23e66bd5df6d979b9efad29a52139552950f29774935cc91fffdbc87805a4c
+  data.tar.gz: 5b3206ee7420635f2f76432a1bbe728e161a9ea434db42da22ac5290ae561e3d
 SHA512:
-  metadata.gz: 871504b4290e8304effa5e30962a8db9fdab6663c73b4f9d9e99edf403af630755ddaaafa557619a86430812b7e54e19931274ec71dd4f86a7b4dc32b73fc669
-  data.tar.gz: f7605b374452517ae3346d896d043e092539abd0a86445eb1a04defbd7516628a70bcd5157fca10c730b7ee6fe047733d1e8e4d65a016c49651cbb12f7e8dcee
+  metadata.gz: cb98f62ce8a62ef0d71364491d1686186c527adc0c6a8612fd5ee118710fe9360166f14ae06b348856548c8b507ef90edf413113e93a9afa56c82e84c267df1e
+  data.tar.gz: 75f30a3ce9473415be91a51acc9fc39a5aacc31b6623943a007b3fb0c41e330752c6f6b470ee759d141b6c84feb96d3b24a015939bb0b053d82ac50a22adb447

data/CHANGELOG.md

@@ -1,9 +1,17 @@
+## [Unreleased]
+
+## [0.1.2] - 2024-12-16
+
+Fix CTE regex matcher (4b1d10b)
+
+## [0.1.1] - 2024-11-27
+
+- Enable RubyGems MFA (2a71b1f)
+
 ## [0.1.0] - 2024-11-19
 
-- Add PostgreSQLProxyAdapter
+- Add PostgreSQLProxyAdapter (2b3bb9f)
 
 ## [0.1.0.rc2] - 2024-10-28
 
-- Add PostgreSQLProxyAdapter
-
-## [Unreleased]
+- Add PostgreSQLProxyAdapter (2b3bb9f)

data/Rakefile

@@ -10,3 +10,16 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
+
+namespace :coverage do
+  desc "Collates all result sets generated by the different test runners"
+  task :report do
+    require "simplecov"
+
+    SimpleCov.collate Dir["coverage/**/.resultset.json"] do
+      add_group "PostgreSQL" do |src_file|
+        [/postgresql/, /postgre_sql/].any? { |pattern| pattern.match?(src_file.filename) }
+      end
+    end
+  end
+end

data/docker/postgres_replica/cmd.sh

@@ -0,0 +1,9 @@
+until pg_basebackup --pgdata=/var/lib/postgresql/data -R --slot=$PRIMARY_REPLICATION_SLOT --host=$PRIMARY_DATABASE_HOST --port=$PRIMARY_DATABASE_PORT
+do
+  echo 'Waiting for primary to connect...'
+  sleep 1s
+done
+
+echo 'Backup done, starting replica...'
+chmod 0700 /var/lib/postgresql/data
+postgres

data/docker-compose.yml

@@ -15,8 +15,8 @@ services:
   app:
     build:
       args:
-        - RUBY_VERSION=${RUBY_VERSION:-3.2.3}
-        - RAILS_VERSION=${RAILS_VERSION:-~> 6.1.0}
+        - RUBY_VERSION=${RUBY_VERSION:-3.3.6}
+        - RAILS_VERSION=${RAILS_VERSION:-8.0.0}
     container_name: app
     image: active_record_proxy_adapters-app:${ENV_TAG:-latest}
     tty: true

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -16,7 +16,7 @@ module ActiveRecordProxyAdapters
       /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i
     ].map(&:freeze).freeze
     # All queries that match these patterns should be sent to the replica database
-    SQL_REPLICA_MATCHERS     = [/\A\s*(select|with.+\)\s*select)\s/i].map(&:freeze).freeze
+    SQL_REPLICA_MATCHERS     = [/\A\s*(select|with\s[\s\S]*\)\s*select)\s/i].map(&:freeze).freeze
     # All queries that match these patterns should be sent to all databases
     SQL_ALL_MATCHERS         = [/\A\s*set\s/i].map(&:freeze).freeze
     # Local sets queries should not be sent to all datbases

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/postgres_replica.dockerfile

@@ -4,20 +4,12 @@ ENV PRIMARY_DATABASE_HOST=localhost
 ENV PRIMARY_DATABASE_PORT=5432
 ENV PRIMARY_REPLICATION_SLOT=replication_slot
 
-USER root
-RUN printf '' > cmd.sh
 
-RUN echo 'until pg_basebackup --pgdata=/var/lib/postgresql/data -R --slot=$PRIMARY_REPLICATION_SLOT --host=$PRIMARY_DATABASE_HOST --port=$PRIMARY_DATABASE_PORT' >> cmd.sh
-RUN echo 'do' >> cmd.sh
-RUN echo "echo 'Waiting for primary to connect...'" >> cmd.sh
-RUN echo 'sleep 1s' >> cmd.sh
-RUN echo 'done' >> cmd.sh
-RUN echo "echo 'Backup done, starting replica...'" >> cmd.sh
-RUN echo 'chmod 0700 /var/lib/postgresql/data' >> cmd.sh
-RUN echo 'postgres' >> cmd.sh
+COPY docker/postgres_replica/cmd.sh cmd.sh
 
+USER root
 RUN chown -R postgres:postgres cmd.sh
 USER postgres
-RUN chmod u+rwx cmd.sh
+RUN chmod u+x cmd.sh
 
 CMD [ "./cmd.sh" ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Matt Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,6 +69,7 @@ files:
 - README.md
 - Rakefile
 - docker-compose.yml
+- docker/postgres_replica/cmd.sh
 - lib/active_record/connection_adapters/postgresql_proxy_adapter.rb
 - lib/active_record/tasks/postgresql_proxy_database_tasks.rb
 - lib/active_record_proxy_adapters.rb