rom-sql 0.9.1 → 1.0.0.beta1

data/lib/rom/sql/qualified_attribute.rb

@@ -1,4 +1,4 @@
-require 'rom/support/cache'
+require 'dry/core/cache'
 
 module ROM
   module SQL
@@ -10,7 +10,7 @@ module ROM
     class QualifiedAttribute
       include Dry::Equalizer(:dataset, :attribute)
 
-      extend Cache
+      extend Dry::Core::Cache
 
       # Dataset (table) name
       #

data/lib/rom/sql/relation.rb

@@ -1,19 +1,14 @@
-require 'rom/sql/header'
 require 'rom/sql/types'
-
 require 'rom/sql/schema'
 
 require 'rom/sql/relation/reading'
 require 'rom/sql/relation/writing'
 
-require 'rom/plugins/relation/view'
 require 'rom/plugins/relation/key_inference'
-require 'rom/plugins/relation/sql/base_view'
 require 'rom/plugins/relation/sql/auto_combine'
 require 'rom/plugins/relation/sql/auto_wrap'
 
-require 'rom/support/deprecations'
-require 'rom/support/constants'
+require 'dry/core/deprecations'
 
 module ROM
   module SQL
@@ -26,8 +21,6 @@ module ROM
       adapter :sql
 
       use :key_inference
-      use :view
-      use :base_view
       use :auto_combine
       use :auto_wrap
 
@@ -42,31 +35,45 @@ module ROM
 
         klass.class_eval do
           schema_dsl SQL::Schema::DSL
-          schema_inferrer -> (dataset, gateway) do
+
+          schema_inferrer -> (name, gateway) do
             inferrer_for_db = ROM::SQL::Schema::Inferrer.get(gateway.connection.database_type.to_sym)
-            inferrer_for_db.new.call(dataset, gateway)
+            begin
+              inferrer_for_db.new.call(name, gateway)
+            rescue Sequel::Error => e
+              ROM::Schema::DEFAULT_INFERRER.()
+            end
           end
 
           dataset do
+            # TODO: feels strange to do it here - we need a new hook for this during finalization
+            klass.define_default_views!
+            schema = klass.schema
+
             table = opts[:from].first
 
             if db.table_exists?(table)
-              pk_header = klass.primary_key_header(db, table)
-              col_names = klass.schema ? klass.schema.attributes.keys : columns
-              select(*col_names).order(*pk_header.qualified)
+              if schema
+                select(*schema.map(&:to_sym)).order(*schema.project(*schema.primary_key_names).qualified.map(&:to_sym))
+              else
+                select(*columns).order(*klass.primary_key_columns(db, table))
+              end
             else
               self
             end
           end
+        end
+      end
 
-          # @!method by_pk(pk)
-          #   Return a relation restricted by its primary key
-          #   @param [Object] pk The primary key value
-          #   @return [SQL::Relation]
-          #   @api public
-          view(:by_pk, attributes[:base]) do |pk|
-            where(primary_key => pk)
-          end
+      # @api private
+      def self.define_default_views!
+        # @!method by_pk(pk)
+        #   Return a relation restricted by its primary key
+        #   @param [Object] pk The primary key value
+        #   @return [SQL::Relation]
+        #   @api public
+        view(:by_pk, schema.map(&:name)) do |pk|
+          where(primary_key => pk)
         end
       end
 
@@ -76,16 +83,9 @@ module ROM
       end
 
       # @api private
-      def self.primary_key_header(db, table)
-        names =
-          if schema
-            schema.primary_key_names
-          elsif db.respond_to?(:primary_key)
-            Array(db.primary_key(table))
-          else
-            [:id]
-          end
-        Header.new(names, table)
+      def self.primary_key_columns(db, table)
+        names = db.respond_to?(:primary_key) ? Array(db.primary_key(table)) : [:id]
+        names.map { |col| :"#{table}__#{col}" }
       end
 
       # Set primary key
@@ -94,8 +94,10 @@ module ROM
       #
       # @api public
       def self.primary_key(value)
-        Deprecations.announce(
-          :primary_key, "use schema definition to configure primary key"
+        Dry::Core::Deprecations.announce(
+          :primary_key,
+          "use schema definition to configure primary key",
+          tag: :rom
         )
         option :primary_key, reader: true, default: value
       end
@@ -104,26 +106,6 @@ module ROM
         rel.schema? ? rel.schema.primary_key_name : :id
       }
 
-      # Return table name from relation's sql statement
-      #
-      # This value is used by `header` for prefixing column names
-      #
-      # @return [Symbol]
-      #
-      # @api private
-      def table
-        @table ||= dataset.opts[:from].first
-      end
-
-      # Return a header for this relation
-      #
-      # @return [Header]
-      #
-      # @api private
-      def header
-        @header ||= Header.new(selected_columns, table)
-      end
-
       # Return raw column names
       #
       # @return [Array<Symbol>]
@@ -132,20 +114,6 @@ module ROM
       def columns
         @columns ||= dataset.columns
       end
-
-      protected
-
-      # Return a list of columns from *the sql select* statement or default to
-      # dataset columns
-      #
-      # This is used to construct relation's header
-      #
-      # @return [Array<Symbol>]
-      #
-      # @api private
-      def selected_columns
-        @selected_columns ||= dataset.opts.fetch(:select, columns)
-      end
     end
   end
 end

data/lib/rom/sql/relation/reading.rb

@@ -1,3 +1,5 @@
+require 'dry/core/inflector'
+
 module ROM
   module SQL
     class Relation < ROM::Relation
@@ -72,8 +74,8 @@ module ROM
         # @return [Relation]
         #
         # @api public
-        def prefix(name = Inflector.singularize(table))
-          rename(header.prefix(name).to_h)
+        def prefix(name = Dry::Core::Inflector.singularize(schema.name.dataset))
+          schema.prefix(name).(self)
         end
 
         # Qualifies all columns in a relation
@@ -87,7 +89,7 @@ module ROM
         #
         # @api public
         def qualified
-          select(*qualified_columns)
+          schema.qualified.(self)
         end
 
         # Return a list of qualified column names
@@ -102,7 +104,7 @@ module ROM
         #
         # @api public
         def qualified_columns
-          header.qualified.to_a
+          schema.qualified.map(&:to_sym)
         end
 
         # Map tuples from the relation
@@ -152,7 +154,7 @@ module ROM
         #
         # @api public
         def project(*names)
-          select(*header.project(*names))
+          schema.project(*names).(self)
         end
 
         # Rename columns in a relation
@@ -169,7 +171,7 @@ module ROM
         #
         # @api public
         def rename(options)
-          select(*header.rename(options))
+          schema.rename(options).(self)
         end
 
         # Select specific columns for select clause
@@ -182,7 +184,7 @@ module ROM
         #
         # @api public
         def select(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          schema.project(*args, &block).(self)
         end
 
         # Append specific columns to select clause
@@ -197,7 +199,7 @@ module ROM
         #
         # @api public
         def select_append(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          schema.merge(self.class.schema.project(*args, &block)).(self)
         end
 
         # Returns a copy of the relation with a SQL DISTINCT clause.
@@ -211,7 +213,7 @@ module ROM
         #
         # @api public
         def distinct(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Returns a result of SQL SUM clause.
@@ -288,7 +290,11 @@ module ROM
         #
         # @api public
         def where(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          if block
+            new(dataset.where(*args).where(self.class.schema.restriction(&block)))
+          else
+            new(dataset.__send__(__method__, *args))
+          end
         end
 
         # Restrict a relation to not match criteria
@@ -302,7 +308,7 @@ module ROM
         #
         # @api public
         def exclude(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Restrict a relation to match grouping criteria
@@ -320,7 +326,11 @@ module ROM
         #
         # @api public
         def having(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          if block
+            new(dataset.having(*args).having(self.class.schema.restriction(&block)))
+          else
+            new(dataset.__send__(__method__, *args, &block))
+          end
         end
 
         # Inverts the current WHERE and HAVING clauses. If there is neither a
@@ -336,13 +346,14 @@ module ROM
         #
         # @api public
         def invert
-          __new__(dataset.invert)
+          new(dataset.invert)
         end
 
         # Set order for the relation
         #
         # @example
         #   users.order(:name)
+        #   users.order { [name.desc, id.qualified.desc]}
         #
         # @param [Array<Symbol>] *args A list with column names
         #
@@ -350,7 +361,11 @@ module ROM
         #
         # @api public
         def order(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          if block
+            new(dataset.order(*args, *self.class.schema.order(&block)))
+          else
+            new(dataset.__send__(__method__, *args, &block))
+          end
         end
 
         # Reverse the order of the relation
@@ -362,7 +377,7 @@ module ROM
         #
         # @api public
         def reverse(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Limit a relation to a specific number of tuples
@@ -379,7 +394,7 @@ module ROM
         #
         # @api public
         def limit(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Set offset for the relation
@@ -393,7 +408,7 @@ module ROM
         #
         # @api public
         def offset(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Join with another relation using INNER JOIN
@@ -407,9 +422,10 @@ module ROM
         # @return [Relation]
         #
         # @api public
-        def inner_join(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+        def join(*args, &block)
+          __join__(__method__, *args, &block)
         end
+        alias_method :inner_join, :join
 
         # Join other relation using LEFT OUTER JOIN
         #
@@ -423,7 +439,23 @@ module ROM
         #
         # @api public
         def left_join(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          __join__(__method__, *args, &block)
+        end
+
+        # Join other relation using RIGHT JOIN
+        #
+        # @example
+        #   users.right_join(:tasks, id: :user_id)
+        #   users.right_join(tasks)
+        #
+        # @param [Symbol] relation name
+        # @param [Hash] join keys
+        #
+        # @return [Relation]
+        #
+        # @api public
+        def right_join(*args, &block)
+          __join__(__method__, *args, &block)
         end
 
         # Group by specific columns
@@ -437,7 +469,7 @@ module ROM
         #
         # @api public
         def group(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Group by specific columns and count by group
@@ -452,7 +484,7 @@ module ROM
         #
         # @api public
         def group_and_count(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new(dataset.__send__(__method__, *args, &block))
         end
 
         # Select and group by specific columns
@@ -467,7 +499,8 @@ module ROM
         #
         # @api public
         def select_group(*args, &block)
-          __new__(dataset.__send__(__method__, *args, &block))
+          new_schema = schema.project(*args, &block)
+          new_schema.(self).group(*new_schema)
         end
 
         # Adds a UNION clause for relation dataset using second relation dataset
@@ -487,7 +520,7 @@ module ROM
         #
         # @api public
         def union(relation, options = EMPTY_HASH, &block)
-          __new__(dataset.__send__(__method__, relation.dataset, options, &block))
+          new(dataset.__send__(__method__, relation.dataset, options, &block))
         end
 
         # Return if a restricted relation has 0 tuples
@@ -519,7 +552,26 @@ module ROM
         #
         # @api public
         def read(sql)
-          __new__(dataset.db[sql])
+          new(dataset.db[sql])
+        end
+
+        private
+
+        # @api private
+        def __join__(type, other, opts = EMPTY_HASH, &block)
+          case other
+          when Symbol, Association::Name
+            new(dataset.__send__(type, other.to_sym, opts, &block))
+          when Relation
+            __send__(type, other.name.dataset, join_keys(other))
+          else
+            raise ArgumentError, "+other+ must be either a symbol or a relation, #{other.class} given"
+          end
+        end
+
+        # @api private
+        def join_keys(other)
+          other.associations[name].join_keys(__registry__)
         end
       end
     end

data/lib/rom/sql/restriction_dsl.rb

@@ -0,0 +1,24 @@
+require 'rom/sql/dsl'
+require 'rom/sql/expression'
+
+module ROM
+  module SQL
+    class RestrictionDSL < DSL
+      # @api private
+      def call(&block)
+        instance_exec(&block)
+      end
+
+      private
+
+      # @api private
+      def method_missing(meth, *args, &block)
+        if schema.key?(meth)
+          ::ROM::SQL::Expression.new(schema[meth])
+        else
+          ::Sequel::VIRTUAL_ROW.__send__(meth, *args, &block)
+        end
+      end
+    end
+  end
+end