torque-postgresql 2.0.6 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd314ab034c3d38a227829faf2d706b13625a5e4cc6393004f6dbe2890e784a8
-  data.tar.gz: 035b0fc92e1ea2aedb507c18094e66025c0fe98838f8553f3abc64764a0b2f03
+  metadata.gz: '09e539b25b952fb4d48bd092a90bae032ad8c26f1584cc5a704cdf96985b1e7e'
+  data.tar.gz: d79aa047ac44dc47a25979f71a0b46dfcbdc573f28d18bfcccbcb59b0a693c7b
 SHA512:
-  metadata.gz: 6eeaffde8209891fee13de7518acea135cfe5f35ecbc5aa59124faad208ed0545a24c2ffb993f10eb5e306c2ccb96036e1dbc812a11177ecdda5e3ead62e0dd7
-  data.tar.gz: ad55cf8b8a5e9de71575c12e8452d440439529258752ceceb95da17111991b8a9ad90101806ab328d5993d328bec69a71feb4cc6b85431c9802d0c225557dbb5
+  metadata.gz: e2f75f66a5e0bed5f14006ff4ffd8e32f96bbe17f18ff4603c0706301c87114a1880b1a8f7bd530501d95c8f6dc10c563af6da5a2ba5f4414a31115c5510ca0f
+  data.tar.gz: 930b6381e8e920a274c411c2ba8abfe96a5b8462227c51dbf5ee9f2a41ac88b6f3a3946d4e49cab0017bb271c176d58c37690e5e646b8536476b83a1cba5c62b

data/lib/torque/postgresql/adapter/database_statements.rb

@@ -123,7 +123,7 @@ module Torque
           SQL
 
           tables.map do |(table, refs)|
-            [table, Coder.decode(refs)]
+            [table, PG::TextDecoder::Array.new.decode(refs)]
           end.to_h
         end
 
@@ -147,20 +147,6 @@ module Torque
           SQL
         end
 
-        # Extracts the value from a PostgreSQL column default definition.
-        def extract_value_from_default(default)
-          case default
-            # Array elements
-          when /\AARRAY\[(.*)\]\z/
-            # TODO: Improve this since it's not the most safe approach
-            eval(default.gsub(/ARRAY|::\w+(\[\])?/, ''))
-          else
-            super
-          end
-        rescue SyntaxError
-          # If somethin goes wrong with the eval, just return nil
-        end
-
       end
     end
   end

data/lib/torque/postgresql/adapter/schema_dumper.rb

@@ -43,13 +43,13 @@ module Torque
             inherited_tables = @connection.inherited_tables
             sorted_tables = @connection.tables.sort - @connection.views
 
-            stream.puts "  # These are the common tables managed"
+            stream.puts "  # These are the common tables"
             (sorted_tables - inherited_tables.keys).each do |table_name|
               table(table_name, stream) unless ignored?(table_name)
             end
 
             if inherited_tables.present?
-              stream.puts "  # These are tables that has inheritance"
+              stream.puts "  # These are tables that have inheritance"
               inherited_tables.each do |table_name, inherits|
                 next if ignored?(table_name)
 

data/lib/torque/postgresql/adapter/schema_statements.rb

@@ -70,7 +70,11 @@ module Torque
 
         # Returns all values that an enum type can have.
         def enum_values(name)
-          select_values("SELECT unnest(enum_range(NULL::#{name}))", 'SCHEMA')
+          select_values(<<-SQL.squish, 'SCHEMA')
+            SELECT enumlabel FROM pg_enum
+            WHERE enumtypid = #{quote(name)}::regtype::oid
+            ORDER BY enumsortorder
+          SQL
         end
 
         # Rewrite the method that creates tables to easily accept extra options

data/lib/torque/postgresql/adapter.rb

@@ -15,6 +15,8 @@ module Torque
       include DatabaseStatements
       include SchemaStatements
 
+      INJECT_WHERE_REGEX = /(DO UPDATE SET.*excluded\.[^ ]+) RETURNING/.freeze
+
       # Get the current PostgreSQL version as a Gem Version.
       def version
         @version ||= Gem::Version.new(
@@ -26,6 +28,20 @@ module Torque
       def extract_table_options!(options)
         super.merge(options.extract!(:inherits))
       end
+
+      # Allow filtered bulk insert by adding the where clause. This method is only used by
+      # +InsertAll+, so it somewhat safe to override it
+      def build_insert_sql(insert)
+        super.tap do |sql|
+          if insert.update_duplicates? && insert.where_condition?
+            if insert.returning
+              sql.gsub!(INJECT_WHERE_REGEX, "\\1 WHERE #{insert.where} RETURNING")
+            else
+              sql << " WHERE #{insert.where}"
+            end
+          end
+        end
+      end
     end
 
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend Adapter

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -16,15 +16,16 @@ module Torque
           elsif !target.empty?
             load_target.pluck(reflection.association_primary_key)
           else
-            stale_state
+            stale_state || column_default_value
           end
         end
 
         def ids_writer(ids)
-          owner.write_attribute(source_attr, ids.presence)
+          ids = ids.presence || column_default_value
+          owner.write_attribute(source_attr, ids)
           return unless owner.persisted? && owner.attribute_changed?(source_attr)
 
-          owner.update_attribute(source_attr, ids.presence)
+          owner.update_attribute(source_attr, ids)
         end
 
         def size
@@ -59,9 +60,11 @@ module Torque
           target
         end
 
-        def build_changes
+        def build_changes(from_target = false)
+          return yield if defined?(@_building_changes) && @_building_changes
+
           @_building_changes = true
-          yield.tap { ids_writer(ids_reader) }
+          yield.tap { ids_writer(from_target ? ids_reader : stale_state) }
         ensure
           @_building_changes = nil
         end
@@ -110,7 +113,7 @@ module Torque
         end
 
         def insert_record(record, *)
-          super.tap do |saved|
+          (record.persisted? || super).tap do |saved|
             ids_rewriter(record.read_attribute(klass_attr), :<<) if saved
           end
         end
@@ -179,23 +182,27 @@ module Torque
           def ids_rewriter(ids, operator)
             list = owner[source_attr] ||= []
             list = list.public_send(operator, ids)
-            owner[source_attr] = list.uniq.compact.presence
+            owner[source_attr] = list.uniq.compact.presence || column_default_value
 
             return if @_building_changes || !owner.persisted?
             owner.update_attribute(source_attr, list)
           end
 
+          def column_default_value
+            owner.class.columns_hash[source_attr].default
+          end
+
           ## HAS MANY
           def replace_records(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def concat_records(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def delete_or_destroy(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def difference(a, b)

data/lib/torque/postgresql/attributes/builder/enum.rb

@@ -33,13 +33,13 @@ module Torque
           def values_methods
             return @values_methods if defined?(@values_methods)
 
-            prefix = options.fetch(:prefix, nil).try(:<<, '_')
-            suffix = options.fetch(:suffix, nil).try(:prepend, '_')
+            prefix = options.fetch(:prefix, nil)
+            suffix = options.fetch(:suffix, nil)
 
-            prefix = attribute + '_' if prefix == true
-            suffix = '_' + attribute if suffix == true
+            prefix = attribute if prefix == true
+            suffix = attribute if suffix == true
 
-            base   = "#{prefix}%s#{suffix}"
+            base   = [prefix, '%s', suffix].compact.join('_')
 
             @values_methods = begin
               values.map do |val|

data/lib/torque/postgresql/attributes/enum.rb

@@ -29,7 +29,7 @@ module Torque
           def include_on(klass, method_name = nil)
             method_name ||= Torque::PostgreSQL.config.enum.base_method
             Builder.include_on(klass, method_name, Builder::Enum) do |builder|
-              defined_enums[builder.attribute.to_sym] = builder.subtype
+              defined_enums[builder.attribute.to_s] = builder.subtype.klass
             end
           end
 

data/lib/torque/postgresql/attributes/enum_set.rb

@@ -32,7 +32,7 @@ module Torque
           def include_on(klass, method_name = nil)
             method_name ||= Torque::PostgreSQL.config.enum.set_method
             Builder.include_on(klass, method_name, Builder::Enum, set_features: true) do |builder|
-              defined_enums[builder.attribute.to_sym] = builder.subtype
+              defined_enums[builder.attribute.to_s] = builder.subtype
             end
           end
 

data/lib/torque/postgresql/base.rb

@@ -40,7 +40,7 @@ module Torque
 
             pg_class = ::Arel::Table.new('pg_class')
             source = ::Arel::Table.new(subclass.table_name, as: 'source')
-            quoted_id = ::Arel::Nodes::Quoted.new(self.class.connection.quote(id))
+            quoted_id = ::Arel::Nodes::Quoted.new(id)
 
             query = ::Arel::SelectManager.new(pg_class)
             query.join(source).on(pg_class['oid'].eq(source['tableoid']))
@@ -206,6 +206,12 @@ module Torque
           ::ActiveRecord::Reflection.add_reflection(self, name, reflection)
         end
 
+        # Allow extra keyword arguments to be sent to +InsertAll+
+        def upsert_all(attributes, **xargs)
+          xargs = xargs.merge(on_duplicate: :update)
+          ::ActiveRecord::InsertAll.new(self, attributes, **xargs).execute
+        end
+
         protected
 
           # Allow optional select attributes to be loaded manually when they are

data/lib/torque/postgresql/insert_all.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Torque
+  module PostgreSQL
+    module InsertAll
+      attr_reader :where
+
+      def initialize(*args, where: nil, **xargs)
+        super(*args, **xargs)
+
+        @where = where
+      end
+    end
+
+    module InsertAll::Builder
+      delegate :where, to: :insert_all
+
+      def where_condition?
+        !where.nil?
+      end
+    end
+
+    ActiveRecord::InsertAll.prepend InsertAll
+    ActiveRecord::InsertAll::Builder.include InsertAll::Builder
+  end
+end

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.0.6'
+    VERSION = '2.1.3'
   end
 end

data/lib/torque/postgresql.rb

@@ -22,7 +22,7 @@ require 'torque/postgresql/autosave_association'
 require 'torque/postgresql/auxiliary_statement'
 require 'torque/postgresql/base'
 require 'torque/postgresql/inheritance'
-require 'torque/postgresql/coder'
+require 'torque/postgresql/insert_all'
 require 'torque/postgresql/migration'
 require 'torque/postgresql/relation'
 require 'torque/postgresql/reflection'

data/spec/factories/item.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :item do
+    name { Faker::Lorem.sentence }
+  end
+end

data/spec/models/item.rb

@@ -0,0 +1,3 @@
+class Item < ActiveRecord::Base
+  belongs_to_many :tags
+end

data/spec/models/question.rb

@@ -0,0 +1,3 @@
+class Question < ActiveRecord::Base
+  self.implicit_order_column = 'created_at'
+end

data/spec/models/question_select.rb

@@ -0,0 +1,2 @@
+class QuestionSelect < Question
+end

data/spec/schema.rb

@@ -11,13 +11,14 @@
 # It's strongly recommended that you check this file into your version control system.
 
 begin
-  version = 63
+  version = 73
 
   raise SystemExit if ActiveRecord::Migrator.current_version == version
   ActiveRecord::Schema.define(version: version) do
     self.verbose = false
 
     # These are extensions that must be enabled in order to support this database
+    enable_extension "pgcrypto"
     enable_extension "plpgsql"
 
     # These are user-defined types used on this database
@@ -102,6 +103,13 @@ begin
       t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
     end
 
+    create_table "items", force: :cascade do |t|
+      t.string   "name"
+      t.bigint   "tag_ids", array: true, default: "{1}"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
     create_table "users", force: :cascade do |t|
       t.string   "name",       null: false
       t.enum     "role",                    subtype: :roles, default: :visitor
@@ -118,6 +126,12 @@ begin
       t.datetime "updated_at", null: false
     end
 
+    create_table "questions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+      t.string   "title"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
     create_table "activity_books", force: :cascade, inherits: :activities do |t|
       t.text     "description"
       t.string   "url"
@@ -132,6 +146,10 @@ begin
 
     create_table "activity_post_samples", force: :cascade, inherits: :activity_posts
 
+    create_table "question_selects", force: :cascade, inherits: :questions do |t|
+      t.string  "options", array: true
+    end
+
     # create_table "activity_blanks", force: :cascade, inherits: :activities
 
     # create_table "activity_images", force: :cascade, inherits: [:activities, :images]

data/spec/tests/belongs_to_many_spec.rb

@@ -147,6 +147,22 @@ RSpec.describe 'BelongsToMany' do
       expect(record.tags.count).to be_eql(5)
     end
 
+    it 'does not trigger after commit on the associated record' do
+      called = false
+
+      tag = FactoryBot.create(:tag)
+      Tag.after_commit { called = true }
+
+      expect(called).to be_falsey
+
+      subject.tags << tag
+
+      expect(subject.tag_ids).to be_eql([tag.id])
+      expect(called).to be_falsey
+
+      Tag.reset_callbacks(:commit)
+    end
+
     it 'can build an associated record' do
       record = subject.tags.build(name: 'Test')
       expect(record).to be_a(other)
@@ -225,6 +241,17 @@ RSpec.describe 'BelongsToMany' do
       expect(subject.tags.size).to be_eql(0)
     end
 
+    it 'can clear the array' do
+      record = Video.create(title: 'B', tags: [initial])
+      expect(record.tags.size).to be_eql(1)
+
+      record.update(tag_ids: [])
+      record.reload
+
+      expect(record.tag_ids).to be_nil
+      expect(record.tags.size).to be_eql(0)
+    end
+
     it 'can have sum operations' do
       records = FactoryBot.create_list(:tag, 5)
       subject.tags.concat(records)
@@ -318,7 +345,30 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
 
-    context "When record is not persisted" do
+    context 'When the attribute has a default value' do
+      subject { FactoryBot.create(:item) }
+
+      it 'will always return the column default value' do
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).to be_eql([1])
+      end
+
+      it 'will keep the value as an array even when the association is cleared' do
+        records = FactoryBot.create_list(:tag, 5)
+        subject.tags.concat(records)
+
+        subject.reload
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).not_to be_eql([1, *records.map(&:id)])
+
+        subject.tags.clear
+        subject.reload
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).to be_eql([1])
+      end
+    end
+
+    context 'When record is not persisted' do
       let(:initial) { FactoryBot.create(:tag) }
 
       subject { Video.new(title: 'A', tags: [initial]) }

data/spec/tests/insert_all_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+RSpec.describe 'InsertAll' do
+  context 'on executing' do
+    before do
+      ActiveRecord::InsertAll.send(:public, :to_sql)
+      allow_any_instance_of(ActiveRecord::InsertAll).to receive(:execute, &:to_sql)
+    end
+
+    subject { Tag }
+
+    let(:entries) { [{ name: 'A' }, { name: 'B' }] }
+
+    it 'does not mess with insert_all' do
+      result = subject.insert_all(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "id"
+      SQL
+
+      result = subject.insert_all(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "name"
+      SQL
+
+      result = subject.insert_all(entries, returning: %i[id name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "id","name"
+      SQL
+    end
+
+    it 'does not mess with insert_all!' do
+      result = subject.insert_all!(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B') RETURNING "id"
+      SQL
+
+      result = subject.insert_all!(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B') RETURNING "name"
+      SQL
+    end
+
+    it 'does not mess with upsert without where' do
+      result = subject.upsert_all(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        RETURNING "id"
+      SQL
+
+      result = subject.upsert_all(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        RETURNING "name"
+      SQL
+    end
+
+    it 'does add the where condition without the returning clause' do
+      result = subject.upsert_all(entries, returning: false, where: '1=1')
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE 1=1
+      SQL
+    end
+
+    it 'does add the where condition with the returning clause' do
+      result = subject.upsert_all(entries, where: '1=1')
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE 1=1 RETURNING "id"
+      SQL
+    end
+
+    xit 'dows work with model-based where clause' do
+      result = subject.upsert_all(entries, where: Tag.where(name: 'C'))
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE "tags"."name" = 'C' RETURNING "id"
+      SQL
+    end
+  end
+end

data/spec/tests/table_inheritance_spec.rb

@@ -387,10 +387,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 +408,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.0.6
+  version: 2.1.3
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,12 +215,12 @@ 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
 - lib/torque/postgresql/i18n.rb
 - lib/torque/postgresql/inheritance.rb
+- lib/torque/postgresql/insert_all.rb
 - lib/torque/postgresql/migration.rb
 - lib/torque/postgresql/migration/command_recorder.rb
 - lib/torque/postgresql/railtie.rb
@@ -242,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
@@ -259,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
@@ -270,13 +274,13 @@ 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
 - 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
@@ -303,53 +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/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

data/spec/tests/coder_spec.rb

@@ -1,367 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'Complex coder', type: :helper do
-  let(:coder) { Torque::PostgreSQL::Coder }
-
-  context 'on decode' do
-
-    context 'one dimensional arrays' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[{}])).to eql []
-      end
-
-      it 'returns an array of strings' do
-        expect(coder.decode(%[{1,2,3}])).to eql ['1','2','3']
-      end
-
-      it 'returns an array of strings, with nils replacing NULL characters' do
-        expect(coder.decode(%[{1,,NULL}])).to eql ['1',nil,nil]
-      end
-
-      it 'returns an array with the word NULL' do
-        expect(coder.decode(%[{1,"NULL",3}])).to eql ['1','NULL','3']
-      end
-
-      it 'returns an array of strings when containing commas in a quoted string' do
-        expect(coder.decode(%[{1,"2,3",4}])).to eql ['1','2,3','4']
-      end
-
-      it 'returns an array of strings when containing an escaped quote' do
-        expect(coder.decode(%[{1,"2\\",3",4}])).to eql ['1','2",3','4']
-      end
-
-      it 'returns an array of strings when containing an escaped backslash' do
-        expect(coder.decode(%[{1,"2\\\\",3,4}])).to eql ['1','2\\','3','4']
-        expect(coder.decode(%[{1,"2\\\\\\",3",4}])).to eql ['1','2\\",3','4']
-      end
-
-      it 'returns an array containing empty strings' do
-        expect(coder.decode(%[{1,"",3,""}])).to eql ['1', '', '3', '']
-      end
-
-      it 'returns an array containing unicode strings' do
-        expect(coder.decode(%[{"Paragraph 399(b)(i) – “valid leave” – meaning"}])).to eq(['Paragraph 399(b)(i) – “valid leave” – meaning'])
-      end
-    end
-
-    context 'two dimensional arrays' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[{{}}])).to eql [[]]
-        expect(coder.decode(%[{{},{}}])).to eql [[],[]]
-      end
-
-      it 'returns an array of strings with a sub array' do
-        expect(coder.decode(%[{1,{2,3},4}])).to eql ['1',['2','3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array' do
-        expect(coder.decode(%[{1,{"2,3"},4}])).to eql ['1',['2,3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted }' do
-        expect(coder.decode(%[{1,{"2,}3",,NULL},4}])).to eql ['1',['2,}3',nil,nil],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted {' do
-        expect(coder.decode(%[{1,{"2,{3"},4}])).to eql ['1',['2,{3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted { and escaped quote' do
-        expect(coder.decode(%[{1,{"2\\",{3"},4}])).to eql ['1',['2",{3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array with empty strings' do
-        expect(coder.decode(%[{1,{""},4,{""}}])).to eql ['1',[''],'4',['']]
-      end
-    end
-
-    context 'three dimensional arrays' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[{{{}}}])).to eql [[[]]]
-        expect(coder.decode(%[{{{},{}},{{},{}}}])).to eql [[[],[]],[[],[]]]
-      end
-
-      it 'returns an array of strings with sub arrays' do
-        expect(coder.decode(%[{1,{2,{3,4}},{NULL,,6},7}])).to eql ['1',['2',['3','4']],[nil,nil,'6'],'7']
-      end
-    end
-
-    context 'record syntax' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[()])).to eql []
-      end
-
-      it 'returns an array of strings' do
-        expect(coder.decode(%[(1,2,3)])).to eql ['1','2','3']
-      end
-
-      it 'returns an array of strings, with nils replacing NULL characters' do
-        expect(coder.decode(%[(1,,NULL)])).to eql ['1',nil,nil]
-      end
-
-      it 'returns an array with the word NULL' do
-        expect(coder.decode(%[(1,"NULL",3)])).to eql ['1','NULL','3']
-      end
-
-      it 'returns an array of strings when containing commas in a quoted string' do
-        expect(coder.decode(%[(1,"2,3",4)])).to eql ['1','2,3','4']
-      end
-
-      it 'returns an array of strings when containing an escaped quote' do
-        expect(coder.decode(%[(1,"2\\",3",4)])).to eql ['1','2",3','4']
-      end
-
-      it 'returns an array of strings when containing an escaped backslash' do
-        expect(coder.decode(%[(1,"2\\\\",3,4)])).to eql ['1','2\\','3','4']
-        expect(coder.decode(%[(1,"2\\\\\\",3",4)])).to eql ['1','2\\",3','4']
-      end
-
-      it 'returns an array containing empty strings' do
-        expect(coder.decode(%[(1,"",3,"")])).to eql ['1', '', '3', '']
-      end
-
-      it 'returns an array containing unicode strings' do
-        expect(coder.decode(%[("Paragraph 399(b)(i) – “valid leave” – meaning")])).to eq(['Paragraph 399(b)(i) – “valid leave” – meaning'])
-      end
-    end
-
-    context 'array of records' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[{()}])).to eql [[]]
-        expect(coder.decode(%[{(),()}])).to eql [[],[]]
-      end
-
-      it 'returns an array of strings with a sub array' do
-        expect(coder.decode(%[{1,(2,3),4}])).to eql ['1',['2','3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array' do
-        expect(coder.decode(%[{1,("2,3"),4}])).to eql ['1',['2,3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted }' do
-        expect(coder.decode(%[{1,("2,}3",,NULL),4}])).to eql ['1',['2,}3',nil,nil],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted {' do
-        expect(coder.decode(%[{1,("2,{3"),4}])).to eql ['1',['2,{3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array and a quoted { and escaped quote' do
-        expect(coder.decode(%[{1,("2\\",{3"),4}])).to eql ['1',['2",{3'],'4']
-      end
-
-      it 'returns an array of strings with a sub array with empty strings' do
-        expect(coder.decode(%[{1,(""),4,("")}])).to eql ['1',[''],'4',['']]
-      end
-    end
-
-    context 'mix of record and array' do
-      it 'returns an empty array' do
-        expect(coder.decode(%[({()})])).to eql [[[]]]
-        expect(coder.decode(%[{({},{}),{(),{}}}])).to eql [[[],[]],[[],[]]]
-      end
-
-      it 'returns an array of strings with sub arrays' do
-        expect(coder.decode(%[{1,(2,{3,4}),(NULL,,6),7}])).to eql ['1',['2',['3','4']],[nil,nil,'6'],'7']
-      end
-    end
-
-    context 'record complex sample' do
-      it 'may have double double quotes translate to single double quotes' do
-        expect(coder.decode(%[("Test with double "" quoutes")])).to eql ['Test with double " quoutes']
-      end
-
-      it 'double double quotes may occur any number of times' do
-        expect(coder.decode(%[("Only one ""","Now "" two "".",""",""{""}","""""")])).to eql ['Only one "', 'Now " two ".', '","{"}', '""']
-      end
-
-      it 'may have any kind of value' do
-        expect(coder.decode(%[(String,123456,false,true,"2016-01-01 12:00:00",{1,2,3})])).to eql ['String', '123456', 'false', 'true', '2016-01-01 12:00:00', ['1', '2', '3']]
-      end
-    end
-
-  end
-
-  context 'on encode' do
-    let(:record) { Torque::PostgreSQL::Coder::Record }
-
-    context 'one dimensional arrays' do
-      it 'receives an empty array' do
-        expect(coder.encode([])).to eql %[{}]
-      end
-
-      it 'receives an array of strings' do
-        expect(coder.encode(['1','2','3'])).to eql %[{1,2,3}]
-      end
-
-      it 'receives an array of strings, with nils replacing NULL characters' do
-        expect(coder.encode(['1',nil,nil])).to eql %[{1,NULL,NULL}]
-      end
-
-      it 'receives an array with the word NULL' do
-        expect(coder.encode(['1','NULL','3'])).to eql %[{1,"NULL",3}]
-      end
-
-      it 'receives an array of strings when containing commas in a quoted string' do
-        expect(coder.encode(['1','2,3','4'])).to eql %[{1,"2,3",4}]
-      end
-
-      it 'receives an array of strings when containing an escaped quote' do
-        expect(coder.encode(['1','2",3','4'])).to eql %[{1,"2\\",3",4}]
-      end
-
-      it 'receives an array of strings when containing an escaped backslash' do
-        expect(coder.encode(['1','2\\','3','4'])).to eql %[{1,"2\\\\",3,4}]
-        expect(coder.encode(['1','2\\",3','4'])).to eql %[{1,"2\\\\\\",3",4}]
-      end
-
-      it 'receives an array containing empty strings' do
-        expect(coder.encode(['1', '', '3', ''])).to eql %[{1,"",3,""}]
-      end
-
-      it 'receives an array containing unicode strings' do
-        expect(coder.encode(['Paragraph 399(b)(i) – “valid leave” – meaning'])).to eql %[{"Paragraph 399(b)(i) – “valid leave” – meaning"}]
-      end
-    end
-
-    context 'two dimensional arrays' do
-      it 'receives an empty array' do
-        expect(coder.encode([[]])).to eql %[{{}}]
-        expect(coder.encode([[],[]])).to eql %[{{},{}}]
-      end
-
-      it 'receives an array of strings with a sub array' do
-        expect(coder.encode(['1',['2','3'],'4'])).to eql %[{1,{2,3},4}]
-      end
-
-      it 'receives an array of strings with a sub array' do
-        expect(coder.encode(['1',['2,3'],'4'])).to eql %[{1,{"2,3"},4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted }' do
-        expect(coder.encode(['1',['2,}3',nil,nil],'4'])).to eql %[{1,{"2,}3",NULL,NULL},4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted {' do
-        expect(coder.encode(['1',['2,{3'],'4'])).to eql %[{1,{"2,{3"},4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted { and escaped quote' do
-        expect(coder.encode(['1',['2",{3'],'4'])).to eql %[{1,{"2\\",{3"},4}]
-      end
-
-      it 'receives an array of strings with a sub array with empty strings' do
-        expect(coder.encode(['1',[''],'4',['']])).to eql %[{1,{""},4,{""}}]
-      end
-    end
-
-    context 'three dimensional arrays' do
-      it 'receives an empty array' do
-        expect(coder.encode([[[]]])).to eql %[{{{}}}]
-        expect(coder.encode([[[],[]],[[],[]]])).to eql %[{{{},{}},{{},{}}}]
-      end
-
-      it 'receives an array of strings with sub arrays' do
-        expect(coder.encode(['1',['2',['3','4']],[nil,nil,'6'],'7'])).to eql %[{1,{2,{3,4}},{NULL,NULL,6},7}]
-      end
-    end
-
-    context 'record syntax' do
-      it 'receives an empty array' do
-        expect(coder.encode( record.new )).to eql %[()]
-      end
-
-      it 'receives an array of strings' do
-        expect(coder.encode( record.new(['1','2','3']) )).to eql %[(1,2,3)]
-      end
-
-      it 'receives an array of strings, with nils replacing NULL characters' do
-        expect(coder.encode( record.new(['1',nil,nil]) )).to eql %[(1,,)]
-      end
-
-      it 'receives an array with the word NULL' do
-        expect(coder.encode( record.new(['1','NULL','3']) )).to eql %[(1,"NULL",3)]
-      end
-
-      it 'receives an array of strings when containing commas in a quoted string' do
-        expect(coder.encode( record.new(['1','2,3','4']) )).to eql %[(1,"2,3",4)]
-      end
-
-      it 'receives an array of strings when containing an escaped quote' do
-        expect(coder.encode( record.new(['1','2",3','4']) )).to eql %[(1,"2\\",3",4)]
-      end
-
-      it 'receives an array of strings when containing an escaped backslash' do
-        expect(coder.encode( record.new(['1','2\\','3','4']) )).to eql %[(1,"2\\\\",3,4)]
-        expect(coder.encode( record.new(['1','2\\",3','4']) )).to eql %[(1,"2\\\\\\",3",4)]
-      end
-
-      it 'receives an array containing empty strings' do
-        expect(coder.encode( record.new(['1', '', '3', '']) )).to eql %[(1,"",3,"")]
-      end
-
-      it 'receives an array containing unicode strings' do
-        expect(coder.encode( record.new(['Paragraph 399(b)(i) – “valid leave” – meaning']) )).to eql %[("Paragraph 399(b)(i) – “valid leave” – meaning")]
-      end
-    end
-
-    context 'array of records' do
-      it 'receives an empty array' do
-        expect(coder.encode([record.new])).to eql %[{()}]
-        expect(coder.encode([record.new,record.new])).to eql %[{(),()}]
-      end
-
-      it 'receives an array of strings with a sub array' do
-        expect(coder.encode(['1',record.new(['2','3']),'4'])).to eql %[{1,(2,3),4}]
-      end
-
-      it 'receives an array of strings with a sub array' do
-        expect(coder.encode(['1',record.new(['2,3']),'4'])).to eql %[{1,("2,3"),4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted }' do
-        expect(coder.encode(['1',record.new(['2,}3',nil,nil]),'4'])).to eql %[{1,("2,}3",,),4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted {' do
-        expect(coder.encode(['1',record.new(['2,{3']),'4'])).to eql %[{1,("2,{3"),4}]
-      end
-
-      it 'receives an array of strings with a sub array and a quoted { and escaped quote' do
-        expect(coder.encode(['1',record.new(['2",{3']),'4'])).to eql %[{1,("2\\",{3"),4}]
-      end
-
-      it 'receives an array of strings with a sub array with empty strings' do
-        expect(coder.encode(['1',record.new(['']),'4',record.new([''])])).to eql %[{1,(""),4,("")}]
-      end
-    end
-
-    context 'mix of record and array' do
-      it 'receives an empty array' do
-        expect(coder.encode( record.new([[record.new,nil]]) )).to eql %[({(),NULL})]
-        expect(coder.encode( [record.new([[], []]),[record.new,[]]] )).to eql %[{({},{}),{(),{}}}]
-      end
-
-      it 'receives an array of strings with sub arrays' do
-        expect(coder.encode(['1',record.new(['2',['3','4']]),record.new([nil,nil,'6']),'7'])).to eql %[{1,(2,{3,4}),(,,6),7}]
-      end
-    end
-
-    context 'record complex sample' do
-      it 'may have double double quotes translate to single double quotes' do
-        expect(coder.encode( record.new(['Test with double " quoutes']) )).to eql %[("Test with double \\" quoutes")]
-      end
-
-      it 'double double quotes may occur any number of times' do
-        expect(coder.encode( record.new(['Only one "', 'Now " two ".', '","{"}', '""']) )).to eql %[("Only one \\"","Now \\" two \\".","\\",\\"{\\"}","\\"\\"")]
-      end
-
-      it 'may have any kind of value' do
-        expect(coder.encode( record.new(['String', '123456', 'false', 'true', '2016-01-01 12:00:00', ['1', '2', '3']]) )).to eql %[(String,123456,false,true,"2016-01-01 12:00:00",{1,2,3})]
-      end
-    end
-
-  end
-
-end