torque-postgresql 1.1.7 → 2.0.4

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation
@@ -33,14 +35,11 @@ module Torque
         # Get all auxiliary statements bound attributes and the base bound
         # attributes as well
         def bound_attributes
-          if Torque::PostgreSQL::AR521
-            visitor = ::Arel::Visitors::PostgreSQL.new(ActiveRecord::Base.connection)
-            visitor.accept(self.arel.ast, ::Arel::Collectors::Bind.new).value
-          else
-            return super unless self.auxiliary_statements_values.present?
-            bindings = self.auxiliary_statements_values.map(&:bound_attributes)
-            (bindings + super).flatten
-          end
+          visitor = ::Arel::Visitors::PostgreSQL.new(ActiveRecord::Base.connection)
+          visitor.accept(self.arel.ast, ::Arel::Collectors::Composite.new(
+            ::Arel::Collectors::SQLString.new,
+            ::Arel::Collectors::Bind.new,
+          )).value.last
         end
 
         private

data/lib/torque/postgresql/relation/distinct_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation
@@ -33,7 +35,7 @@ module Torque
 
           # Hook arel build to add the distinct on clause
           def build_arel(*)
-            arel = Torque::PostgreSQL::AR521 ? super : super()
+            arel = super
             value = self.distinct_on_values
             arel.distinct_on(resolve_column(value)) if value.present?
             arel

data/lib/torque/postgresql/relation/inheritance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/relation/merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/schema_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     LookupError = Class.new(ArgumentError)

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
-    VERSION = '1.1.7'
+    VERSION = '2.0.4'
   end
 end

data/spec/en.yml

@@ -0,0 +1,19 @@
+en:
+  torque: 'Torque Rocks!'
+  activerecord:
+    attributes:
+      user:
+        role:
+          visitor: 'A simple Visitor'
+      role:
+        assistant: 'An Assistant'
+    enums:
+      content_status:
+        created: '1 - Created'
+      roles:
+        manager: 'The Manager'
+  enum:
+    content_status:
+      draft: 'Draft (2)'
+    published: 'Finally published'
+    admin: 'Super Duper Admin'

data/spec/factories/authors.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :author do
+    name      { Faker::Name.name }
+    specialty { Enum::Specialties.values.sample }
+  end
+end

data/spec/factories/comments.rb

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :comment do
+    content { Faker::Lorem.paragraph }
+
+    factory :comment_recursive do
+      comment_id { Comment.order('RANDOM()').first.id }
+    end
+
+    trait :random_user do
+      user_id { User.order('RANDOM()').first.id }
+    end
+  end
+end

data/spec/factories/posts.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :post do
+    title   { Faker::Lorem.sentence }
+    content { Faker::Lorem.paragraph }
+  end
+end

data/spec/factories/tags.rb

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

data/spec/factories/texts.rb

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

data/spec/factories/users.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user do
+    name { Faker::Name.name }
+    role { 'visitor' }
+  end
+end

data/spec/factories/videos.rb

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

data/spec/mocks/cache_query.rb

@@ -0,0 +1,16 @@
+module Mocks
+  module CacheQuery
+    def get_last_executed_query(&block)
+      conn = ActiveRecord::Base.connection
+      conn.instance_variable_set(:@query_cache_enabled, true)
+
+      block.call
+      result = conn.query_cache.keys.first
+
+      conn.instance_variable_set(:@query_cache_enabled, false)
+      conn.instance_variable_get(:@query_cache).delete(result)
+
+      result
+    end
+  end
+end

data/spec/mocks/create_table.rb

@@ -0,0 +1,35 @@
+module Mocks
+  module CreateTable
+    def mock_create_table
+      path = ActiveRecord::Base.connection.method(:create_table).super_method.source_location[0]
+
+      before :all do
+        ActiveRecord::ConnectionAdapters::SchemaStatements.send(:define_method, :create_table) do |table_name, **options, &block|
+          td = create_table_definition(table_name, **options)
+
+          # Does things as the same as schema statements
+          if options[:id] != false && !options[:as]
+            pk = options.fetch(:primary_key) do
+              ActiveRecord::Base.get_primary_key table_name.to_s.singularize
+            end
+
+            if pk.is_a?(Array)
+              td.primary_keys pk
+            else
+              td.primary_key pk, options.fetch(:id, :primary_key), **options
+            end
+          end
+
+          block.call(td) if block.present?
+
+          # Now generate the SQL and return it
+          schema_creation.accept td
+        end
+      end
+
+      after :all do
+        load path
+      end
+    end
+  end
+end

data/spec/models/activity.rb

@@ -0,0 +1,3 @@
+class Activity < ActiveRecord::Base
+  belongs_to :author
+end

data/spec/models/activity_book.rb

@@ -0,0 +1,4 @@
+require_relative 'activity'
+
+class ActivityBook < Activity
+end

data/spec/models/activity_post.rb

@@ -0,0 +1,7 @@
+require_relative 'activity'
+
+class ActivityPost < Activity
+  belongs_to :post
+end
+
+require_relative 'activity_post/sample'

data/spec/models/activity_post/sample.rb

@@ -0,0 +1,4 @@
+class ActivityPost < Activity
+  class Sample < ActivityPost
+  end
+end

data/spec/models/author.rb

@@ -0,0 +1,4 @@
+class Author < ActiveRecord::Base
+  has_many :activities, -> { cast_records }
+  has_many :posts
+end

data/spec/models/author_journalist.rb

@@ -0,0 +1,4 @@
+require_relative 'author'
+
+class AuthorJournalist < Author
+end

data/spec/models/comment.rb

@@ -0,0 +1,3 @@
+class Comment < ActiveRecord::Base
+  belongs_to :user
+end

data/spec/models/course.rb

@@ -0,0 +1,2 @@
+class Course < ActiveRecord::Base
+end

data/spec/models/geometry.rb

@@ -0,0 +1,2 @@
+class Geometry < ActiveRecord::Base
+end

data/spec/models/guest_comment.rb

@@ -0,0 +1,4 @@
+require_relative 'comment'
+
+class GuestComment < Comment
+end

data/spec/models/post.rb

@@ -0,0 +1,6 @@
+class Post < ActiveRecord::Base
+  belongs_to :author
+  belongs_to :activity
+
+  scope :test_scope, -> { where('1=1') }
+end

data/spec/models/tag.rb

@@ -0,0 +1,2 @@
+class Tag < ActiveRecord::Base
+end

data/spec/models/text.rb

@@ -0,0 +1,2 @@
+class Text < ActiveRecord::Base
+end

data/spec/models/time_keeper.rb

@@ -0,0 +1,2 @@
+class TimeKeeper < ActiveRecord::Base
+end

data/spec/models/user.rb

@@ -0,0 +1,8 @@
+class User < ActiveRecord::Base
+  has_many :comments
+
+  auxiliary_statement :last_comment do |cte|
+    cte.query Comment.distinct_on(:user_id).order(:user_id, id: :desc)
+    cte.attributes id: :comment_id, content: :comment_content
+  end
+end

data/spec/models/video.rb

@@ -0,0 +1,2 @@
+class Video < ActiveRecord::Base
+end

data/spec/schema.rb

@@ -0,0 +1,141 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+begin
+  version = 62
+
+  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 "plpgsql"
+
+    # These are user-defined types used on this database
+    create_enum "content_status", ["created", "draft", "published", "archived"], force: :cascade
+    create_enum "specialties", ["books", "movies", "plays"], force: :cascade
+    create_enum "roles", ["visitor", "assistant", "manager", "admin"], force: :cascade
+    create_enum "conflicts", ["valid", "invalid", "untrusted"], force: :cascade
+    create_enum "types", ["A", "B", "C", "D"], force: :cascade
+
+    create_table "geometries", force: :cascade do |t|
+      t.point   "point"
+      t.line    "line"
+      t.lseg    "lseg"
+      t.box     "box"
+      t.path    "closed_path"
+      t.path    "open_path"
+      t.polygon "polygon"
+      t.circle  "circle"
+    end
+
+    create_table "time_keepers", force: :cascade do |t|
+      t.daterange "available"
+      t.tsrange   "period"
+      t.tstzrange "tzperiod"
+      t.interval  "th"
+    end
+
+    create_table "tags", force: :cascade do |t|
+      t.string "name"
+    end
+
+    create_table "videos", force: :cascade do |t|
+      t.bigint   "tag_ids", array: true
+      t.string   "title"
+      t.string   "url"
+      t.enum     "type", subtype: :types
+      t.enum     "conflicts", subtype: :conflicts, array: true
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "authors", force: :cascade do |t|
+      t.string   "name"
+      t.string   "type"
+      t.enum     "specialty", subtype: :specialties
+    end
+
+    create_table "texts", force: :cascade do |t|
+      t.integer  "user_id"
+      t.string   "content"
+      t.enum     "conflict",  subtype: :conflicts
+    end
+
+    create_table "comments", force: :cascade do |t|
+      t.integer "user_id",    null: false
+      t.integer "comment_id"
+      t.text    "content",    null: false
+      t.string  "kind"
+      t.index ["user_id"], name: "index_comments_on_user_id", using: :btree
+      t.index ["comment_id"], name: "index_comments_on_comment_id", using: :btree
+    end
+
+    create_table "courses", force: :cascade do |t|
+      t.string   "title",      null: false
+      t.interval "duration"
+      t.enum     "types", subtype: :types, array: true
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "images", force: :cascade, id: false do |t|
+      t.string "file"
+    end
+
+    create_table "posts", force: :cascade do |t|
+      t.integer  "author_id"
+      t.integer  "activity_id"
+      t.string   "title"
+      t.text     "content"
+      t.enum     "status",    subtype: :content_status
+      t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
+    end
+
+    create_table "users", force: :cascade do |t|
+      t.string   "name",       null: false
+      t.enum     "role",                    subtype: :roles, default: :visitor
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
+    create_table "activities", force: :cascade do |t|
+      t.integer  "author_id"
+      t.string   "title"
+      t.boolean  "active"
+      t.enum     "kind",                    subtype: :types
+      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"
+      t.boolean  "activated"
+    end
+
+    create_table "activity_posts", force: :cascade, inherits: [:activities, :images] do |t|
+      t.integer  "post_id"
+      t.string   "url"
+      t.integer  "activated"
+    end
+
+    create_table "activity_post_samples", force: :cascade, inherits: :activity_posts
+
+    # create_table "activity_blanks", force: :cascade, inherits: :activities
+
+    # create_table "activity_images", force: :cascade, inherits: [:activities, :images]
+
+    add_foreign_key "posts", "authors"
+  end
+rescue SystemExit
+end

data/spec/spec_helper.rb

@@ -0,0 +1,59 @@
+require 'torque-postgresql'
+require 'database_cleaner'
+require 'factory_bot'
+require 'dotenv'
+require 'faker'
+require 'rspec'
+require 'byebug'
+
+Dotenv.load
+
+ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+cache = ActiveRecord::Base.connection.schema_cache
+
+cleaner = ->() do
+  cache.instance_variable_set(:@inheritance_loaded, false)
+  cache.instance_variable_set(:@inheritance_dependencies, {})
+  cache.instance_variable_set(:@inheritance_associations, {})
+end
+
+load File.join('schema.rb')
+Dir.glob(File.join('spec', '{models,factories,mocks}', '*.rb')) do |file|
+  require file[5..-4]
+end
+
+cleaner.call
+I18n.load_path << Pathname.pwd.join('spec', 'en.yml')
+RSpec.configure do |config|
+  config.extend Mocks::CreateTable
+  config.include Mocks::CacheQuery
+
+  config.formatter = :documentation
+  config.color     = true
+  config.tty       = true
+
+  # Handles acton before rspec initialize
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, js: true) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+  config.before(:each) do
+    cleaner.call
+  end
+end