rails_sql_prettifier 6.0.6 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b2fae31052f2d4e36efb1c866a1f69e0a6d1ca94757c17bcd4edf82715fdcb
-  data.tar.gz: a981254b8b0fe7187c5131a5dedbde563e06b631dbf775f7232c388eb9a92bec
+  metadata.gz: 459c1f20e82eb14b0130418cb1161272383ae9f9f902164100b2a4d81bbabb9c
+  data.tar.gz: db5ee936e31bd470ac74940b2fa086e4a1aec84004cb05971c6434e8f5cb2ea1
 SHA512:
-  metadata.gz: ba0edebb77ea3050622d298f44b3cfeeb8bb7837214e6fc663e9da407fffc0145c35b77abbb8b46b063da4864726253fad7208a6c5bc29bdfbca8e231583207a
-  data.tar.gz: 7c52e3a94ba9540d05b1b472ecdb492315efde99250783e5a17882ee53285217704044e3a1799592f58d0302969e2c5bc5ec1d233419fa8629204052a2cf449c
+  metadata.gz: a159e5b627abaa4ac80c70092668aad54f11f871c13a57e83585e38851d2f522273653d79871b2b087d1bce83de00c9119b6b2d7c28b60d7b75c8b13b1e3dde1
+  data.tar.gz: 4feabc414ccf282a7462c44527514449735b8bcdf9b2b84afe3b873735176cecbe1dcc40dfa6745b67af114391a1a38808cc3658bae4e45e8b242267932e32ce

data/.byebug_history

@@ -0,0 +1,34 @@
+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

data/.gitignore

@@ -8,5 +8,4 @@
 /spec/reports/
 /tmp/
 /inspectionProfiles/
-.idea
-.byebug_history
+.idea

data/.ruby-gemset

@@ -1 +1 @@
-rails_sql_prettifier_ar_6_0
+rails_sql_prettifier_ar_6

data/CHANGELOG.md

@@ -1,20 +1,8 @@
-# 6.0.6
-* 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 !)
-
-#6.0.5
-* fixed issue [#20](https://github.com/alekseyl/niceql/issues/20)
-* adding support for multiple ruby versions testing using docker-compose
-
-# 6.0.4
-* Now AR is a dependency not a development dependency
-
-# 6.0.3
-* Fixed issue with Niceql.configure not configuring anything + test covered
-
-#6.0.2
+# 6.1.0
 
 * This a active record prior to 7.0 version and >= 6.1 compatible niceql integration 
-  ar < 6.0 breaking change: 
-  * StatementInvalid initialization has a breaking change: starting version 6 it has named param sql: for original query )
+  ar < 6.0: 
+  * StatementInvalid initialization, starting version 6 it has named param sql: for original query )
   
+  ar <= 6.1: 
+  * Starting from 6.1 connection_db_config used as standalone object instead of connection_config

data/README.md

@@ -1,12 +1,7 @@
 # RailsSQLPrettifier
 
-This is an ActiveRecord integration for a niceql gem ( niceql is a small, nice, simple and zero dependency solution for the SQL prettifying in ruby ).
-
-This gem started as a code extraction from niceql version 0.4.x. 
-
-It has versioning aligned to the ActiveRecord versions, niceql prior to 0.5 version had hardcoded logic branches based on ActiveRecord versioning. 
-
-That is hard to maintain and hard to test, and also coupling with AR is breaking the original idea of the niceql to be a dependentless solution, so now the niceql is a completely railsfree gem yeay! ( It still has some some checks related to AR implementations in the error prettifying methods. It will be completely decoupled in the future )
+This is an ActiveRecord integration for a niceql gem.
+Niceql is a small, nice, simple and zero dependency solution for SQL prettifying for Ruby. 
 
 Any reasonable suggestions are welcome. 
 
@@ -28,13 +23,10 @@ after:
 
 ## Installation
 
-rails_sql_prettifier, has several version compatible with different active_record versions, so pay attention to the right versioning
-if whenever you specify versions manually.   
-
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rails_sql_prettifier', '~> X.X.X'
+gem 'rails_sql_prettifier'
 ```
 
 And then execute:
@@ -51,14 +43,12 @@ Or install it yourself as:
 
 ```ruby
 Niceql.configure do |c|
-  # Setting pg_adapter_with_nicesql to true will APPLY formatting SQL queries
+  # Setting pg_adapter_with_nicesql to true will force 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 
   # 
-  # 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 
+  # You can adjust pg_adapter in production but do it at your own risk!
   # 
   # If you need to debug SQL queries in production use exec_niceql
   # 
@@ -96,6 +86,8 @@ end
 
 ## Usage
 
+### With ActiveRecord
+
 ```ruby
   # puts colorized and formatted corresponding SQL query
   Model.scope.niceql
@@ -103,7 +95,7 @@ end
   # only formatting without colorization, you can run output of to_niceql as a SQL query in connection.execute  
   Model.scope.to_niceql
   
-  # will run prettified sql and hence will properly prettify PG errors if scope runs with any 
+  # prettify PG errors if scope runs with any 
   Model.scope_with_err.exec_niceql 
 ```
 
@@ -157,10 +149,7 @@ end
 If your console support more colors or different schemes, or if you prefer different colorization, then you can override ColorizeString methods. 
 Current colors were selected with dark and white console themes in mind, so a niceql colorization works good for dark, and good enough for white.
 
-## Testing
-```bash
-docker-compose up
-```
+## 
 
 ## Contributing
 

data/lib/rails_sql_prettifier/version.rb

@@ -1,3 +1,3 @@
 module RailsSQLPrettifier
-  VERSION = '6.0.6'
+  VERSION = '6.1.1'
 end

data/lib/rails_sql_prettifier.rb

@@ -2,8 +2,8 @@ require "rails_sql_prettifier/version"
 require 'active_record'
 require "niceql"
 
-
 module RailsSQLPrettifier
+  include Niceql
 
   module ArExtentions
     def exec_niceql
@@ -28,13 +28,11 @@ module RailsSQLPrettifier
   end
 
   module AbstractAdapterLogPrettifier
-    private
-    def log( sql, *args, **kwargs, &block )
+    def log( sql, *args, &block )
       # \n need to be placed because AR log will start with action description + time info.
       # rescue sql - just to be sure Prettifier wouldn't break production
       formatted_sql = "\n" + Niceql::Prettifier.prettify_sql(sql) rescue sql
-
-      super( formatted_sql, *args, **kwargs, &block )
+      super( formatted_sql, *args, &block )
     end
   end
 
@@ -46,7 +44,7 @@ module RailsSQLPrettifier
     end
   end
 
-  module NiceQLConfigExt
+  module ARNiceQLConfig
     extend ActiveSupport::Concern
 
     included do
@@ -57,7 +55,7 @@ module RailsSQLPrettifier
 
 
     def ar_using_pg_adapter?
-      ActiveRecord::Base.try(:connection_config)&.with_indifferent_access&.dig(:adapter) == 'postgresql'
+      ActiveRecord::Base.connection_db_config.adapter == 'postgresql'
     end
 
     def initialize
@@ -66,26 +64,17 @@ module RailsSQLPrettifier
       self.prettify_active_record_log_output = false
       self.prettify_pg_errors = ar_using_pg_adapter?
     end
-  end
-
-  module NiceqlExt
-    def configure
-      super
 
-      if config.pg_adapter_with_nicesql && defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && !protected_env?
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL)
-      end
+    module ClassMethods
+      def configure
+        super
 
-      ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier ) if config.prettify_active_record_log_output
+        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL) if config.pg_adapter_with_nicesql
 
-      ::ActiveRecord::StatementInvalid.include( RailsSQLPrettifier::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
-    end
-  end
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier ) if config.prettify_active_record_log_output
 
-  module ProtectedEnv
-    def protected_env?
-      ActiveRecord::Base.connection.migration_context.protected_environment? ||
-        defined?(Rails) && !(Rails.env.test? || Rails.env.development?)
+        ::ActiveRecord::StatementInvalid.include( Niceql::ErrorExt ) if config.prettify_pg_errors && config.ar_using_pg_adapter?
+      end
     end
   end
 
@@ -93,9 +82,5 @@ module RailsSQLPrettifier
    ::Arel::TreeManager,
    ::Arel::Nodes::Node].each { |klass| klass.send(:include, ArExtentions) }
 
-  Niceql::NiceQLConfig.include( NiceQLConfigExt )
-
-  # we need to use a prepend otherwise it's not preceding Niceql.configure in a lookup chain
-  Niceql.singleton_class.prepend( NiceqlExt )
-  Niceql.extend(ProtectedEnv)
+  NiceQLConfig.include( ARNiceQLConfig )
 end

data/rails_sql_prettifier.gemspec

@@ -31,18 +31,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.4'
-  spec.add_dependency "niceql", '~> 0.6'
-  spec.add_dependency "activerecord", '>= 6.0', '< 6.1'
+  spec.add_dependency "niceql", '~> 0.5'
+
+  spec.add_development_dependency "activerecord", '>= 6.1', '< 7'
 
   spec.add_development_dependency "bundler", ">= 1"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "differ", '~> 0.1'
   spec.add_development_dependency "pry-byebug", '~> 3.9'
   spec.add_development_dependency 'sqlite3', '~> 1'
-  spec.add_development_dependency 'pg', '~> 1'
-
-  spec.add_development_dependency 'stubberry', '~> 0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sql_prettifier
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.1
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceql
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :runtime
+        version: '7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
@@ -142,34 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: stubberry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 description: 'This is an ActiveRecord integration for the SQL prettifier gem niceql. '
 email:
 - leshchuk@gmail.com
@@ -177,20 +135,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".byebug_history"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
-- Dockerfile
-- Dockerfile_30
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- docker-compose.yml
 - err_now.png
 - err_was.png
 - lib/benchmark/cat.rb

data/Dockerfile

@@ -1,20 +0,0 @@
-FROM ruby:2.7.5-bullseye
-
-WORKDIR /app
-RUN  apt-get update && apt-get -y install lsb-release
-#
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-    apt-get update && apt-get -y install postgresql postgresql-client-12
-
-RUN sh -c 'echo "local   all             all                                     trust" > /etc/postgresql/14/main/pg_hba.conf' && \
-    service postgresql start && \
-    psql -U postgres -c 'CREATE DATABASE "niceql-test"'
-
-RUN  gem install bundler
-
-COPY lib/rails_sql_prettifier/version.rb /app/lib/rails_sql_prettifier/version.rb
-COPY rails_sql_prettifier.gemspec /app/
-COPY Gemfil* /app/
-#
-RUN bundle install

data/Dockerfile_30

@@ -1,20 +0,0 @@
-FROM ruby:3.0.3-bullseye
-
-WORKDIR /app
-RUN  apt-get update && apt-get -y install lsb-release
-#
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-    apt-get update && apt-get -y install postgresql postgresql-client-12
-
-RUN sh -c 'echo "local   all             all                                     trust" > /etc/postgresql/14/main/pg_hba.conf' && \
-    service postgresql start && \
-    psql -U postgres -c 'CREATE DATABASE "niceql-test"'
-
-RUN  gem install bundler
-
-COPY lib/rails_sql_prettifier/version.rb /app/lib/rails_sql_prettifier/version.rb
-COPY rails_sql_prettifier.gemspec /app/
-COPY Gemfil* /app/
-#
-RUN bundle install

data/docker-compose.yml

@@ -1,19 +0,0 @@
-version: "3.7"
-
-services:
-  test:
-    build: .
-    image: rsp_6_0
-    command: /bin/bash -c 'service postgresql start && rake test'
-    volumes:
-      - '.:/app'
-
-  test_3_0:
-    build:
-      context: .
-      dockerfile: Dockerfile_30
-    image: rsp_6_0_3_0
-    command: /bin/bash -c 'service postgresql start && rake test'
-    volumes:
-      - '.:/app'
-