torque-postgresql 1.1.7 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac2d4e3c96cf93edeac515986a6b7ba3ca412712c6eb19a38f09e0b0e5e448a
-  data.tar.gz: 133b756202e8e39738d7bda361f3fd9544829ef817b7ac518f972bf175da93c1
+  metadata.gz: f108bfb672743d7edd701b77eb102aa6f9164b4981e1f366d2354d9e8cf3360b
+  data.tar.gz: 60d7208f0798acbde69aee78fca7a92d4824c75dcecc44acd16dcf59568f0e04
 SHA512:
-  metadata.gz: '08a2cb8062f7bdcf6497f4c2b33dc102c6df5d45ed5c82f6c772caeddb02f7a87056b06b13e6c09359b9db52dff46eabcb64f644e17682b1f830fdd988ff44ea'
-  data.tar.gz: f419dd80f7a3c9972b0eb469ed63bf5454ede498ee688761f7c99587db8b2d48d06b5b40e4696a1760ea077f750d966a9e67a500b5b2d4b8b0fa3fccc1c0f884
+  metadata.gz: 0a463f94c5a09f74bbb2ba57fe9fb2f7fe649f243c239f7709180c29988f2b5424bffec68d0ec1d2c4ae8ad1191d6156e96dd00c2a66a2a473e02411c563e21f
+  data.tar.gz: 1568915cd13e2b93b77a702cfd346326aa9e07605aac3deca0f3dacbe82b24762a84f3007a4dffc493888c94802724defbfc01037d0bad984e3735783a790f35

data/lib/torque/postgresql.rb

@@ -6,7 +6,6 @@ require 'active_support'
 
 require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/time/zones'
-require 'active_support/core_ext/hash/compact'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'torque/postgresql/config'
@@ -28,6 +27,5 @@ require 'torque/postgresql/migration'
 require 'torque/postgresql/relation'
 require 'torque/postgresql/reflection'
 require 'torque/postgresql/schema_cache'
-require 'torque/postgresql/schema_dumper'
 
 require 'torque/postgresql/railtie' if defined?(Rails)

data/lib/torque/postgresql/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'adapter/database_statements'
 require_relative 'adapter/oid'
 require_relative 'adapter/quoting'
@@ -10,7 +12,6 @@ module Torque
   module PostgreSQL
     module Adapter
       include Quoting
-      include ColumnDumper unless Torque::PostgreSQL::AR521
       include DatabaseStatements
       include SchemaStatements
 
@@ -20,6 +21,11 @@ module Torque
           select_value('SELECT version()').match(/#{Adapter::ADAPTER_NAME} ([\d\.]+)/)[1]
         )
       end
+
+      # Add `inherits` to the list of extracted table options
+      def extract_table_options!(options)
+        super.merge(options.extract!(:inherits))
+      end
     end
 
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend Adapter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter
@@ -43,16 +45,9 @@ module Torque
         end
 
         # :nodoc:
-        if Torque::PostgreSQL::AR521
-          def load_additional_types(oids = nil)
-            super
-            torque_load_additional_types(oids)
-          end
-        else
-          def load_additional_types(type_map, oids = nil)
-            super
-            torque_load_additional_types(oids)
-          end
+        def load_additional_types(oids = nil)
+          super
+          torque_load_additional_types(oids)
         end
 
         # Add the composite types to be loaded too.
@@ -80,11 +75,7 @@ module Torque
           SQL
 
           execute_and_clear(query, 'SCHEMA', []) do |records|
-            records.each do |row|
-              case row['typtype']
-              when 'e' then OID::Enum.create(row, type_map)
-              end
-            end
+            records.each { |row| OID::Enum.create(row, type_map) }
           end
         end
 

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

@@ -17,9 +17,11 @@ module Torque
       ActiveRecord::Type.register(:circle,   OID::Circle,   adapter: :postgresql)
       ActiveRecord::Type.register(:enum,     OID::Enum,     adapter: :postgresql)
       ActiveRecord::Type.register(:enum_set, OID::EnumSet,  adapter: :postgresql)
-      ActiveRecord::Type.register(:interval, OID::Interval, adapter: :postgresql)
       ActiveRecord::Type.register(:line,     OID::Line,     adapter: :postgresql)
       ActiveRecord::Type.register(:segment,  OID::Segment,  adapter: :postgresql)
+
+      ActiveRecord::Type.register(:interval, OID::Interval, adapter: :postgresql) \
+        unless PostgreSQL::AR610
     end
   end
 end

data/lib/torque/postgresql/adapter/oid/box.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Box < Struct.new(:x1, :y1, :x2, :y2)

data/lib/torque/postgresql/adapter/oid/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Circle < Struct.new(:x, :y, :r)

data/lib/torque/postgresql/adapter/oid/enum.rb

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

data/lib/torque/postgresql/adapter/oid/enum_set.rb

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

data/lib/torque/postgresql/adapter/oid/interval.rb

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

data/lib/torque/postgresql/adapter/oid/line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Line < Struct.new(:slope, :intercept)

data/lib/torque/postgresql/adapter/oid/range.rb

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

data/lib/torque/postgresql/adapter/oid/segment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Segment < Struct.new(:point0, :point1)

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

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

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

@@ -5,10 +5,11 @@ module Torque
 
         # Redefine original table creation command to ensure PostgreSQL standard
         def visit_TableDefinition(o)
-          create_sql = "CREATE#{' TEMPORARY' if o.temporary}"
-          create_sql << " TABLE #{quote_table_name(o.name)}"
+          create_sql = +"CREATE#{table_modifier_in_create(o)} TABLE "
+          create_sql << "IF NOT EXISTS " if o.if_not_exists
+          create_sql << "#{quote_table_name(o.name)} "
 
-          statements = o.columns.map{ |c| accept c }
+          statements = o.columns.map { |c| accept c }
           statements << accept(o.primary_keys) if o.primary_keys
 
           if supports_indexes_in_create?
@@ -17,36 +18,32 @@ module Torque
             end)
           end
 
-          if supports_foreign_keys_in_create?
+          if supports_foreign_keys?
             statements.concat(o.foreign_keys.map do |to_table, options|
               foreign_key_in_create(o.name, to_table, options)
             end)
           end
 
-          if o.as
-            create_sql << " AS #{@conn.to_sql(o.as)}"
-          else
-            create_sql << " (#{statements.join(', ')})"
-            add_table_options!(create_sql, table_options(o))
-
-            if o.inherits.present?
-              tables = o.inherits.map(&method(:quote_table_name))
-              create_sql << " INHERITS ( #{tables.join(' , ')} )"
-            end
+          if respond_to?(:supports_check_constraints?) && supports_check_constraints?
+            statements.concat(o.check_constraints.map do |expression, options|
+              check_constraint_in_create(o.name, expression, options)
+            end)
           end
 
-          create_sql
-        end
+          create_sql << "(#{statements.join(', ')})" \
+            if statements.present? || o.inherits.present?
 
-        # Keep rails 5.0 and 5.1 compatibility
-        def supports_foreign_keys_in_create?
-          if defined?(super)
-            super
-          else
-            supports_foreign_keys?
+          options = PostgreSQL::AR610 ? o : table_options(o)
+          add_table_options!(create_sql, options)
+
+          if o.inherits.present?
+            tables = o.inherits.map(&method(:quote_table_name))
+            create_sql << " INHERITS ( #{tables.join(' , ')} )"
           end
-        end
 
+          create_sql << " AS #{to_sql(o.as)}" if o.as
+          create_sql
+        end
       end
 
       ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaCreation.prepend SchemaCreation

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter
@@ -7,17 +9,15 @@ module Torque
         # dates to be stored without having to store a seconds-based integer
         # or any sort of other approach
         def interval(*args, **options)
-          args.each { |name| column(name, :interval, options) }
+          args.each { |name| column(name, :interval, **options) }
         end
 
         # Creates a column with an enum type, needing to specify the subtype,
         # which is basically the name of the type defined prior creating the
         # column
         def enum(*args, **options)
-          args.each do |name|
-            type = options.fetch(:subtype, name)
-            column(name, type, options)
-          end
+          subtype = options.delete(:subtype)
+          args.each { |name| column(name, (subtype || name), **options) }
         end
 
         # Creates a column with an enum array type, needing to specify the
@@ -34,23 +34,11 @@ module Torque
 
         attr_reader :inherits
 
-        def initialize(name, *_, **options)
-          old_args = []
-          old_args << options.delete(:temporary) || false
-          old_args << options.delete(:options)
-          old_args << options.delete(:as)
-          comment = options.delete(:comment)
-
-          super(name, *old_args, comment: comment)
-
-          if options.key?(:inherits)
-            @inherits = Array[options.delete(:inherits)].flatten.compact
-            @inherited_id = !(options.key?(:primary_key) || options.key?(:id))
-          end
-        end
+        def initialize(*args, **options)
+          super
 
-        def inherited_id?
-          @inherited_id
+          @inherits = Array.wrap(options.delete(:inherits)).flatten.compact \
+            if options.key?(:inherits)
         end
       end
 

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

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter
-      module ColumnDumper
+      module SchemaDumper
+        def dump(stream) # :nodoc:
+          @connection.dump_mode!
+          super
 
-        # Adds +:subtype+ as a valid migration key
-        unless Torque::PostgreSQL::AR521
-          def migration_keys
-            super + [:subtype]
-          end
+          @connection.dump_mode!
+          stream
+        end
+
+        def extensions(stream) # :nodoc:
+          super
+          user_defined_types(stream)
         end
 
         # Translate +:enum_set+ into +:enum+
         def schema_type(column)
-          if column.type == :enum_set
-            :enum
-          else
-            super
-          end
+          column.type == :enum_set ? :enum : super
         end
 
         # Adds +:subtype+ option to the default set
@@ -36,7 +39,69 @@ module Torque
             column.sql_type.to_sym.inspect if column.type == :enum || column.type == :enum_set
           end
 
+          def tables(stream) # :nodoc:
+            inherited_tables = @connection.inherited_tables
+            sorted_tables = @connection.tables.sort - @connection.views
+
+            stream.puts "  # These are the common tables managed"
+            (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"
+              inherited_tables.each do |table_name, inherits|
+                next if ignored?(table_name)
+
+                sub_stream = StringIO.new
+                table(table_name, sub_stream)
+
+                # Add the inherits setting
+                sub_stream.rewind
+                inherits.map!(&:to_sym)
+                inherits = inherits.first if inherits.size === 1
+                inherits = ", inherits: #{inherits.inspect} do |t|"
+                table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
+
+                # Ensure bodyless definitions
+                table_dump.gsub!(/do \|t\|\n  end/, '')
+                stream.print table_dump
+              end
+            end
+
+            # Dump foreign keys at the end to make sure all dependent tables exist.
+            if @connection.supports_foreign_keys?
+              sorted_tables.each do |tbl|
+                foreign_keys(tbl, stream) unless ignored?(tbl)
+              end
+            end
+
+            # Scenic integration
+            views(stream) if defined?(::Scenic)
+          end
+
+          # Dump user defined types like enum
+          def user_defined_types(stream)
+            types = @connection.user_defined_types('e')
+            return unless types.any?
+
+            stream.puts "  # These are user-defined types used on this database"
+            types.sort_by(&:first).each { |(name, type)| send(type.to_sym, name, stream) }
+            stream.puts
+          rescue => e
+            stream.puts "# Could not dump user-defined types because of following #{e.class}"
+            stream.puts "#   #{e.message}"
+            stream.puts
+          end
+
+          # Dump enum custom type
+          def enum(name, stream)
+            values = @connection.enum_values(name).map { |v| "\"#{v}\"" }
+            stream.puts "  create_enum \"#{name}\", [#{values.join(', ')}], force: :cascade"
+          end
       end
+
+      ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend SchemaDumper
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter
@@ -73,24 +75,14 @@ module Torque
 
         # Rewrite the method that creates tables to easily accept extra options
         def create_table(table_name, **options, &block)
-          td = create_table_definition(table_name, **options)
-          options[:id] = false if td.inherited_id?
-          options[:temporary] = td
+          options[:id] = false if options[:inherits].present? &&
+            options[:primary_key].blank? && options[:id].blank?
 
           super table_name, **options, &block
         end
 
         private
 
-          # This waits for the second call to really return the table definition
-          def create_table_definition(*args, **options) # :nodoc:
-            if !args.second.kind_of?(TableDefinition)
-              TableDefinition.new(*args, **options)
-            else
-              args.second
-            end
-          end
-
           def quote_enum_values(name, values, options)
             prefix = options[:prefix]
             prefix = name if prefix === true

data/lib/torque/postgresql/arel/infix_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel
@@ -22,6 +24,8 @@ module Torque
       }.freeze
 
       INFLIX_OPERATION.each do |operator_name, operator|
+        next if nodes.const_defined?(operator_name)
+
         klass = Class.new(inflix)
         klass.send(:define_method, :initialize) { |*args| super(operator, *args) }
 
@@ -31,7 +35,7 @@ module Torque
         # Don't worry about quoting here, if the right side is something that
         # doesn't need quoting, it will leave it as it is
         Math.send(:define_method, operator_name.underscore) do |other|
-          klass.new(self, nodes.build_quoted(other, self))
+          klass.new(self, other)
         end
       end