torque-postgresql 2.1.0 → 2.2.0

data/spec/tests/table_inheritance_spec.rb

@@ -292,14 +292,12 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'adds all statements to load all the necessary records' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class", "i_0"."description"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class, "i_0"."description"'
         result << ', COALESCE("i_0"."url", "i_1"."url", "i_2"."url") AS url, "i_0"."activated" AS activity_books__activated'
         result << ', "i_1"."activated" AS activity_posts__activated, "i_2"."activated" AS activity_post_samples__activated'
         result << ', COALESCE("i_1"."file", "i_2"."file") AS file, COALESCE("i_1"."post_id", "i_2"."post_id") AS post_id'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books', 'activity_posts', 'activity_post_samples') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books', 'activity_posts', 'activity_post_samples') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'
@@ -307,33 +305,27 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'can be have simplefied joins' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class'
         result << ', "i_0"."description", "i_0"."url", "i_0"."activated"'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         expect(base.cast_records(child).all.to_sql).to eql(result)
       end
 
       it 'can be filtered by record type' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class'
         result << ', "i_0"."description", "i_0"."url", "i_0"."activated"'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
-        result << " WHERE \"record_class\".\"_record_class\" = 'activity_books'"
+        result << " WHERE \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books')"
         expect(base.cast_records(child, filter: true).all.to_sql).to eql(result)
       end
 
       it 'works with count and does not add extra columns' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT COUNT(*)'
+        result = 'SELECT COUNT(*)'
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'
@@ -342,10 +334,8 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'works with sum and does not add extra columns' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT SUM("activities"."id")'
+        result = 'SELECT SUM("activities"."id")'
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'
@@ -387,10 +377,10 @@ RSpec.describe 'TableInheritance' do
         base.create(title: 'Activity test')
         child.create(title: 'Activity book')
         other.create(name: 'An author name')
+        base.instance_variable_set(:@casted_dependents, nil)
       end
 
       it 'does not affect normal records' do
-        base.instance_variable_set(:@casted_dependents, {})
         expect(base.first.cast_record).to be_a(base)
         expect(child.first.cast_record).to be_a(child)
         expect(other.first.cast_record).to be_a(other)
@@ -408,9 +398,28 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'does trigger record casting when accessed through inheritance' do
-        base.instance_variable_set(:@casted_dependents, nil)
         expect(base.second.cast_record).to eql(child.first)
       end
+
+      context 'using uuid' do
+        let(:base) { Question }
+        let(:child) { QuestionSelect }
+
+        before :each do
+          base.create(title: 'Simple question')
+          child.create(title: 'Select question')
+          base.instance_variable_set(:@casted_dependents, nil)
+        end
+
+        it 'does not affect normal records' do
+          expect(base.first.cast_record).to be_a(base)
+          expect(child.first.cast_record).to be_a(child)
+        end
+
+        it 'does trigger record casting when accessed through inheritance' do
+          expect(base.second.cast_record).to eql(child.first)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,7 +215,6 @@ files:
 - lib/torque/postgresql/auxiliary_statement.rb
 - lib/torque/postgresql/auxiliary_statement/settings.rb
 - lib/torque/postgresql/base.rb
-- lib/torque/postgresql/coder.rb
 - lib/torque/postgresql/collector.rb
 - lib/torque/postgresql/config.rb
 - lib/torque/postgresql/geometry_builder.rb
@@ -243,6 +242,7 @@ files:
 - spec/en.yml
 - spec/factories/authors.rb
 - spec/factories/comments.rb
+- spec/factories/item.rb
 - spec/factories/posts.rb
 - spec/factories/tags.rb
 - spec/factories/texts.rb
@@ -260,7 +260,10 @@ files:
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
+- spec/models/item.rb
 - spec/models/post.rb
+- spec/models/question.rb
+- spec/models/question_select.rb
 - spec/models/tag.rb
 - spec/models/text.rb
 - spec/models/time_keeper.rb
@@ -271,7 +274,6 @@ files:
 - spec/tests/arel_spec.rb
 - spec/tests/auxiliary_statement_spec.rb
 - spec/tests/belongs_to_many_spec.rb
-- spec/tests/coder_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
 - spec/tests/enum_set_spec.rb
@@ -305,54 +307,57 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files:
-- spec/models/activity_post/sample.rb
+- spec/en.yml
+- spec/factories/authors.rb
+- spec/factories/comments.rb
+- spec/factories/item.rb
+- spec/factories/posts.rb
+- spec/factories/tags.rb
+- spec/factories/texts.rb
+- spec/factories/users.rb
+- spec/factories/videos.rb
+- spec/mocks/cache_query.rb
+- spec/mocks/create_table.rb
 - spec/models/activity.rb
+- spec/models/activity_book.rb
+- spec/models/activity_post.rb
+- spec/models/activity_post/sample.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
 - spec/models/comment.rb
 - spec/models/course.rb
-- spec/models/post.rb
-- spec/models/text.rb
-- spec/models/user.rb
-- spec/models/activity_book.rb
-- spec/models/activity_post.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
+- spec/models/item.rb
+- spec/models/post.rb
 - spec/models/tag.rb
+- spec/models/text.rb
 - spec/models/time_keeper.rb
+- spec/models/user.rb
 - spec/models/video.rb
-- spec/factories/authors.rb
-- spec/factories/comments.rb
-- spec/factories/posts.rb
-- spec/factories/tags.rb
-- spec/factories/texts.rb
-- spec/factories/users.rb
-- spec/factories/videos.rb
-- spec/tests/geometric_builder_spec.rb
-- spec/tests/range_spec.rb
+- spec/models/question.rb
+- spec/models/question_select.rb
+- spec/spec_helper.rb
 - spec/tests/arel_spec.rb
-- spec/tests/insert_all_spec.rb
-- spec/tests/enum_spec.rb
-- spec/tests/period_spec.rb
-- spec/tests/coder_spec.rb
+- spec/tests/auxiliary_statement_spec.rb
+- spec/tests/belongs_to_many_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
+- spec/tests/enum_set_spec.rb
+- spec/tests/enum_spec.rb
+- spec/tests/geometric_builder_spec.rb
+- spec/tests/has_many_spec.rb
+- spec/tests/insert_all_spec.rb
 - spec/tests/interval_spec.rb
 - spec/tests/lazy_spec.rb
+- spec/tests/period_spec.rb
 - spec/tests/quoting_spec.rb
+- spec/tests/range_spec.rb
 - spec/tests/relation_spec.rb
-- spec/tests/auxiliary_statement_spec.rb
-- spec/tests/enum_set_spec.rb
-- spec/tests/has_many_spec.rb
-- spec/tests/belongs_to_many_spec.rb
 - spec/tests/table_inheritance_spec.rb
-- spec/mocks/cache_query.rb
-- spec/mocks/create_table.rb
-- spec/en.yml
-- spec/spec_helper.rb
 - spec/schema.rb

data/lib/torque/postgresql/coder.rb

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-module Torque
-  module PostgreSQL
-    module Coder
-
-      # This class represents an Record to be encoded, instead of a literal Array
-      Record = Class.new(Array)
-
-      class << self
-
-        NEED_QUOTE_FOR = /[\\"(){}, \t\n\r\v\f]/m
-        DELIMITER = ','
-
-        # This method replace the +read_array+ method from PG gem
-        # See https://github.com/ged/ruby-pg/blob/master/ext/pg_text_decoder.c#L177
-        # for more information
-        def decode(value)
-          # TODO: Use StringScanner
-          # See http://ruby-doc.org/stdlib-1.9.3/libdoc/strscan/rdoc/StringScanner.html
-          _decode(::StringIO.new(value))
-        end
-
-        # This method replace the ++ method from PG gem
-        # See https://github.com/ged/ruby-pg/blob/master/ext/pg_text_encoder.c#L398
-        # for more information
-        def encode(value)
-          _encode(value)
-        end
-
-        private
-
-          def _decode(stream)
-            quoted = 0
-            escaped = false
-            result = []
-            part = String.new
-
-            # Always start getting the non-collection character, the second char
-            stream.getc if stream.pos == 0
-
-            # Check for an empty list
-            return result if %w[} )].include?(stream.getc)
-
-            # If it's not an empty list, return one position before iterating
-            stream.pos -= 1
-            stream.each_char do |c|
-
-              case
-              when quoted < 1
-                case
-                when c == DELIMITER, c == '}', c == ')'
-
-                  unless escaped
-                    # Non-quoted empty string or NULL as extense
-                    part = nil if quoted == 0 && ( part.length == 0 || part == 'NULL' )
-                    result << part
-                  end
-
-                  return result unless c == DELIMITER
-
-                  escaped = false
-                  quoted = 0
-                  part = String.new
-
-                when c == '"'
-                  quoted = 1
-                when c == '{', c == '('
-                  result << _decode(stream)
-                  escaped = true
-                else
-                  part << c
-                end
-              when escaped
-                escaped = false
-                part << c
-              when c == '\\'
-                escaped = true
-              when c == '"'
-                if stream.getc == '"'
-                  part << c
-                else
-                  stream.pos -= 1
-                  quoted = -1
-                end
-              else
-                if ( c == '"' || c == "'" ) && stream.getc != c
-                  stream.pos -= 1
-                  quoted = -1
-                else
-                  part << c
-                end
-              end
-
-            end
-          end
-
-          def _encode(list)
-            is_record = list.is_a?(Record)
-            list.map! do |part|
-              case part
-              when NilClass
-                is_record ? '' : 'NULL'
-              when Array
-                _encode(part)
-              else
-                _quote(part.to_s)
-              end
-            end
-
-            result = is_record ? '(%s)' : '{%s}'
-            result % list.join(DELIMITER)
-          end
-
-          def _quote(string)
-            len = string.length
-
-            # Fast results
-            return '""' if len == 0
-            return '"NULL"' if len == 4 && string == 'NULL'
-
-            # Check if the string don't need quotes
-            return string unless string =~ NEED_QUOTE_FOR
-
-            # Use the original string escape function
-            PG::Connection.escape_string(string).inspect
-          end
-
-      end
-
-    end
-  end
-end