rails_sql_prettifier 6.1.4 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a944dc1c5ff11aae8445592a777d82edaf2fd812278467d8ebc95d1333ac93
-  data.tar.gz: ca73d669390fa3dd4293279f5e7299f69674295b48677c9234a52cd62f4c95d8
+  metadata.gz: fdf919f40234cb53ea8a819066c0f83b289a20d25143f130aef38e9145d8c6bb
+  data.tar.gz: 7b137d512642549c1824b50acaaaf4ad123593814316833ac880a49e3cddb195
 SHA512:
-  metadata.gz: c3e40ba9047a8ffcf41f928e4b9821235bb2cd671686fb06876256cab46da39eab586d811c6d4488aceb915fa26561e7e11e5d70790973fece1bd1f228a7619a
-  data.tar.gz: 0236a8cab9e9cfb404c10275cc3a6683609653f21d0e2691ecf5f6d60e611be55bffb97fac29671b66d2ffd7a4683b8b1e95d82694403376d14441bff0c58b4f
+  metadata.gz: a1cecf0951a654443dd085c2abf96829af343ea590e9776319cfd9261ad03d5bcd6eb45a65f9c50699a025787ed8c3ca38c574bfd2cee94785f6cad3c252f959
+  data.tar.gz: 2909521fbfc5f49cfe57aae5ffe68a778ebdcaf4a55f725486ead326a2abe2634431ceba0ba736d98bc9ff1340e3b0e647f1b724cc73d9f9bfb3bab1a4d97f0f

data/.ruby-gemset

@@ -1 +1 @@
-rails_sql_prettifier_ar_6
+rails_sql_prettifier

data/CHANGELOG.md

@@ -1,15 +1,13 @@
-# 6.1.4
+# 7.0.4
+* pg_adapter_with_nicesql setting will not be set to action for protected_env
+* niceql version set to ~> 0.6 (fixed https://github.com/alekseyl/niceql/issues/16 !)
+
+#7.0.3
 * fixed issue [#20](https://github.com/alekseyl/niceql/issues/20)
 * adding support for multiple ruby versions testing using docker-compose
 
-# 6.1.3
-* Now AR is a dependency not a development dependency 
-
-# 6.1.0
+#7.0.2
+* active record versioning is properly aligned now 
 
-* This a active record prior to 7.0 version and >= 6.1 compatible niceql integration 
-  ar < 6.0 breaking change: 
-  * StatementInvalid initialization ahs a breaking change: starting version 6 it has named param sql: for original query )
-  
-  ar <= 6.1: 
-  * Starting from 6.1 connection_db_config method replaced connection_config which was a hash
+#7.0.0
+* current master branch 

data/Dockerfile_30

@@ -17,4 +17,4 @@ COPY lib/rails_sql_prettifier/version.rb /app/lib/rails_sql_prettifier/version.r
 COPY rails_sql_prettifier.gemspec /app/
 COPY Gemfil* /app/
 #
-RUN bundle install
+RUN bundle install

data/README.md

@@ -51,12 +51,14 @@ Or install it yourself as:
 
 ```ruby
 Niceql.configure do |c|
-  # Setting pg_adapter_with_nicesql to true will force formatting SQL queries
+  # Setting pg_adapter_with_nicesql to true will APPLY formatting SQL queries
   # before execution. Formatted SQL will lead to much better SQL-query debugging and much more clearer error messages 
   # if you are using Postgresql as a data source. 
-  # BUT do not use it in production until https://github.com/alekseyl/niceql/issues/16 is resolved 
   # 
-  # You can adjust pg_adapter in production but do it at your own risk!
+  # BUT even though https://github.com/alekseyl/niceql/issues/16 is resolved, 
+  # there could be other potentially uncovered bugs so its better not to
+  # adjust pg_adapter in production, currently there is an additional blocker for that module ProtectedEnv
+  # its will not allow patching PGAdapter for other than test/development envs 
   # 
   # If you need to debug SQL queries in production use exec_niceql
   # 
@@ -101,7 +103,7 @@ end
   # only formatting without colorization, you can run output of to_niceql as a SQL query in connection.execute  
   Model.scope.to_niceql
   
-  # prettify PG errors if scope runs with any 
+  # will run prettified sql and hence will properly prettify PG errors if scope runs with any 
   Model.scope_with_err.exec_niceql 
 ```
 

data/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.7"
 services:
   test:
     build: .
-    image: rsp_6_1
+    image: niceql
     command: /bin/bash -c 'service postgresql start && rake test'
     volumes:
       - '.:/app'
@@ -12,8 +12,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile_30
-    image: rsp_6_1_3_0
+    image: niceql_3_0
     command: /bin/bash -c 'service postgresql start && rake test'
     volumes:
       - '.:/app'
-

data/lib/rails_sql_prettifier/version.rb

@@ -1,3 +1,3 @@
 module RailsSQLPrettifier
-  VERSION = '6.1.4'
+  VERSION = '7.0.4'
 end

data/lib/rails_sql_prettifier.rb

@@ -2,7 +2,6 @@ require "rails_sql_prettifier/version"
 require 'active_record'
 require "niceql"
 
-
 module RailsSQLPrettifier
 
   module ArExtentions
@@ -71,8 +70,8 @@ module RailsSQLPrettifier
     def configure
       super
 
-      if config.pg_adapter_with_nicesql && defined?( ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter )
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include( PostgresAdapterNiceQL)
+      if config.pg_adapter_with_nicesql && defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && !protected_env?
+        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL)
       end
 
       ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier ) if config.prettify_active_record_log_output
@@ -81,6 +80,13 @@ module RailsSQLPrettifier
     end
   end
 
+  module ProtectedEnv
+    def protected_env?
+      ActiveRecord::Base.connection.migration_context.protected_environment? ||
+        defined?(Rails) && !(Rails.env.test? || Rails.env.development?)
+    end
+  end
+
   [::ActiveRecord::Relation,
    ::Arel::TreeManager,
    ::Arel::Nodes::Node].each { |klass| klass.send(:include, ArExtentions) }
@@ -89,4 +95,5 @@ module RailsSQLPrettifier
 
   # we need to use a prepend otherwise it's not preceding Niceql.configure in a lookup chain
   Niceql.singleton_class.prepend( NiceqlExt )
-end
+  Niceql.extend(ProtectedEnv)
+end

data/rails_sql_prettifier.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.4'
-  spec.add_dependency "niceql", '~> 0.5'
-  spec.add_dependency "activerecord", '>= 6.1', '< 7'
+  spec.add_dependency "niceql", '~> 0.6'
+  spec.add_dependency "activerecord", '>= 7'
 
   spec.add_development_dependency "bundler", ">= 1"
   spec.add_development_dependency "rake", ">= 12.3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sql_prettifier
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 7.0.4
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceql
@@ -16,22 +16,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7'
   type: :runtime
@@ -39,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
@@ -177,7 +171,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"

data/.byebug_history

@@ -1,34 +0,0 @@
-exit
-ActiveRecord::Base.connection_db_config.adapter
-ActiveRecord::Base.connection_db_config.adpter
-ActiveRecord::Base.connection_db_config
-c
-exit
-si.sql
-si
-c
-sql_body
-n
-s
-original_sql_query
-err
-s
-up
-s
-up
-s
-up
-s
-super
-try(:sql)
-Niceql.config.prettify_pg_errors
-c
-exit
-err_template
- si.to_s
-exit
- err_caret_line
-err_quote_caret_offset
-c
- err.lines[1].index( '...' ).to_i
-err_caret_line