active_reporting 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a5444ba19be4d20842e16f8e800e45837e133bd
-  data.tar.gz: 24b59685e4cd70770a13a8a2925c85d860e782a3
+SHA256:
+  metadata.gz: 63bda6ce4591fc9695b29db8e53aee19966e3630e9c8b059c686678043f20938
+  data.tar.gz: e780a77254b8c8b1cc23ecc732146d581def733fef8669fc3a0419e32fabf5df
 SHA512:
-  metadata.gz: 1df566a6122ec806f231a116ffe33cf729374fe529ddf18a2763cb2462946414c60bada55a06e7fc036ef3c4fc0002f021d06b1147cb011c7810ce1b517cd82e
-  data.tar.gz: 0ec9387af8a5918f3685732b4331377302e373ae56843305991d2c8abc24928c4a19ea79ed7d3bd6b5e979204c2a15cde3806df62a282a8714ac0d6a439fb4e6
+  metadata.gz: 89718eab7d4398d77f9d19de7e7160e52feebfc295e03a7c05a113a87159e5e3640b599d681559c53e749bf68bdcee477effff6b4b605c4dcf317da6c09d2cdd
+  data.tar.gz: 4d999fe0374b28e826edbb6f6eca9fc9f8ab9ae7aff1056aa88757079e00847f8361862108ba65227f530b72fa918e849dd3bbfe1b337156a685dd4f26b706d8

data/.gitignore

@@ -6,5 +6,7 @@
 /doc/
 /pkg/
 /spec/reports/
+.byebug_history
+.ruby-version
 /tmp/
 .DS_STORE

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
     - Gemfile
   TargetRubyVersion: 2.3
 
+Metrics/ClassLength:
+  Max: 150
+
 Metrics/LineLength:
   Max: 120
 

data/.travis.yml

@@ -1,19 +1,20 @@
 sudo: false
 language: ruby
+services:
+  - mysql
+addons:
+  postgresql: "9.6"
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 env:
+  - RAILS=6-0 DB=sqlite
+  - RAILS=6-0 DB=pg
+  - RAILS=6-0 DB=mysql
   - RAILS=5-2 DB=sqlite
   - RAILS=5-2 DB=pg
   - RAILS=5-2 DB=mysql
-  - RAILS=5-1 DB=sqlite
-  - RAILS=5-1 DB=pg
-  - RAILS=5-1 DB=mysql
-  - RAILS=4-2 DB=sqlite
-  - RAILS=4-2 DB=pg
-  - RAILS=4-2 DB=mysql
 before_script:
   - psql -c 'create database active_reporting_test;' -U postgres
   - mysql -e 'create database active_reporting_test collate utf8_general_ci;'

data/CHANGELOG.md

@@ -1,3 +1,54 @@
+## 0.6.0 (2020-08-21)
+
+### Features
+
+* Support to implicit hierarchical on datetime columns in MySQL (#33) - *germanotm*
+* Added `{ datetime_drill: :month }` option for reporting dimentions to explicitly -  *germanotm*
+
+  This depricates the use of key-value only use for report dimension options (ie, `dimensions: [{ dim: single_option }]`).
+  Instead, use `dimensions: [{ dim: { option: value} }]` See the README for all reporting dimension options.
+
+## 0.5.1 (2020-06-31)
+
+### Features
+
+* Allow dimensions defined in a `Metric` to use LEFT OUTER JOINs via a new `:join_method` option (#32) - *germanotm*
+
+### Misc
+
+* Fixed warning about initialized variables
+* Fixed Ruby 2.7 warning
+
+## 0.5.0 (2020-06-30)
+
+### Bug Fixes
+
+* Fix Missing quotation marks in column names causing SQL errors on MYSQL (#30) - *germanotm*
+
+### Misc
+
+* Update matrix to only supported Rubies and Rails versions. Rails 5.2+ and Ruby 2.5+ are officially supported now.
+
+## 0.4.2 (2019-11-01)
+
+### Misc
+
+* Test against Rails 6.0 final
+* Fixed deprecated call to `to_hash` - *joshforbes*
+* Corrected readme entry for `dimesions` option for `ActiveReporting::Metric` - *joshforbes*
+
+## 0.4.1 (2019-05-28)
+
+### Features
+
+* Hierarchical dimensions may now have custom keys in result (#16) - *andresgutgon*
+
+### Misc
+
+* Test against Raisl 6.0RC
+* Loosen AR requirements. The gem will install for any AR version, but only ones listed in the README are supported
+* Test against active Rubies
+
 ## 0.4.0 (2018-05-02)
 
 ### Breaking Changes
@@ -15,7 +66,7 @@
 * Specify rescue from LoadError for ransack (#9) - *niborg*
 * Fix ransack fallback logic (#8) - *germanotm*
 
-## Misc
+### Misc
 
 * Test against Rails 5.2
 * Test against Ruby 2.5

data/Gemfile

@@ -8,16 +8,8 @@ rails = ENV['RAILS'] || '5-2'
 db = ENV['DB'] || 'sqlite'
 
 case rails
-when '4-2'
-  gem 'activerecord', '~> 4.2.0'
-  if ENV['DB'] == 'pg'
-    gem 'pg', '~> 0.18'
-  end
-  if ENV['DB'] == 'mysql'
-    gem 'mysql2', '~> 0.3.18'
-  end
-when '5-1'
-  gem 'activerecord', '~> 5.1.0'
-else
+when '5-2'
   gem 'activerecord', '~> 5.2.0'
+when '6-0'
+  gem 'activerecord', '~> 6.0.0'
 end

data/README.md

@@ -8,9 +8,9 @@ ActiveReporting implements various terminology used in Relational Online Analyti
 
 ActiveReporting officially supports MySQL, PostgreSQL, and SQLite.
 
-ActiveReporting officially supports Ruby 2.3, 2.4, and 2.5.
+ActiveReporting officially supports Ruby 2.5 and later. Other versions may work, but are not supported.
 
-ActiveReporting officially supports Rails 4.2, 5.1, and 5.2.
+ActiveReporting officially supports Rails 5.2, and 6.0. Other versions may work, but are not supported.
 
 ## Installation
 
@@ -49,8 +49,9 @@ Rails: ActiveRecord model
 A dimension is a point of data used to "slice and dice" data from a fact model. It's either a column that lives on the fact table or a foreign key to another table.
 
 Examples:
-* A sales rep on a fact table of orders
-* A state of an order on a state machine
+
+* A sales rep on a fact table of sales
+* A state of an sale on a state machine
 * The manufacture on a fact table of widgets
 
 SQL Equivalent: JOIN, GROUP BY
@@ -62,6 +63,7 @@ Rails: ActiveRecord relation or attribute
 A hierarchy for a dimension is related attributes that live on a dimension table used to drill down and drill up through a dimension.
 
 Examples:
+
 * Dates: Date, Month, Year, Quarter
 * Mobile Phone: Model, Manufacture, OS, Wireless Technology
 
@@ -70,6 +72,7 @@ Examples:
 This is information related to a dimension. When the dimension lives on the fact table, the label is the column used. When the dimension is a related table, the label is a column representing the hierarchy level.
 
 Examples:
+
 * When dimensioning blog posts by category, the dimension is the category_id which leads to the categories table. The label would be the category name.
 
 ### Dimension Filter (or just "filter")
@@ -85,6 +88,7 @@ Rails: `where()`, scopes, etc.
 A measure is a column in a fact table (usually a numeric value) used in aggregations such as sum, maximum, average, etc.
 
 Examples:
+
 * Total amount in a sale
 * Number of units used in a transaction
 
@@ -178,7 +182,7 @@ end
 ActiveReporting assumes the column of a fact model used for summing, averaging, etc. is called `value`. This may be changed on a fact model using `measure=`. You may pass in a string or symbol of the column you wish to use for aggregations.
 
 ```ruby
-class OrderFactModel < ActiveReporting::FactModel
+class SaleFactModel < ActiveReporting::FactModel
   self.measure = :total
 end
 ```
@@ -219,11 +223,9 @@ class PhoneFactModel < ActiveReporting::FactModel
 end
 ```
 
-### Implicit hierarchies with datetime columns (PostgreSQL support only)
+### Drill down / Roll up (Drill up) with datetime columns
 
-The fastest approach to group by certain date metrics is to create so-called "date dimensions". For
-those Postgres users that are restricted from organizing their data in this way, Postgres provides
-a way to group by `datetime` column data on the fly using the `date_trunc` function.
+The fastest approach to group by certain date metrics is to create so-called "date dimensions" and add on columns for each desired hierarchy. For those users that are restricted from organizing their data in this way,  ActiveRporting provides a `datetime_drill` option that can be passed with the dimension on the metric definition to drill datetime columns.
 
 To use, declare a datetime dimension on a fact model as normal:
 
@@ -233,7 +235,23 @@ class UserFactModel < ActiveReporting::FactModel
 end
 ```
 
-When creating a metric, ActiveReporting will recognize implicit hierarchies for this dimension. The hierarchies correspond to the [values](https://www.postgresql.org/docs/8.1/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC) supported by PostgreSQL. (See example under the metric section, below.)
+When creating a metric, ActiveReporting will recognize the following datetime hierarchies: (See example under the metric section, below.)
+
+- microseconds
+- milliseconds
+- second
+- minute
+- hour
+- day
+- week
+- month
+- quarter
+- year
+- decade
+- century
+- millennium
+
+Under the hood Active Reporting uses specific database functions to manipulate datetime columns. Postgres provides a way to group by `datetime` column data on the fly using the [`date_trunc` function](https://www.postgresql.org/docs/8.1/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC). On Mysql this can be done using [Date and Time Functions](https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html).
 
 *NOTE*: PRs welcomed to support this functionality in other databases.
 
@@ -273,8 +291,8 @@ A `Metric` is the basic building block used to describe a question you want to a
 
 ```ruby
 my_metric = ActiveReporting::Metric.new(
-  :order_total,
-  fact_model: OrderFactModel,
+  :sale_total,
+  fact_model: SaleFactModel,
   aggregate: :sum
 )
 ```
@@ -285,7 +303,17 @@ my_metric = ActiveReporting::Metric.new(
 
 `aggregate` - The SQL aggregate used to calculate the metric. Supported aggregates include count, max, min, avg, and sum. (Default: `:count`)
 
-`dimensions` - An array of dimensions used for the metric. When given just a symbol, the default dimension label will be used for the dimension. You may specify a hierarchy level by using a hash. (Examples: `[:sales_rep, {order_date: :month}]`)
+`dimensions` - An array of dimensions used for the metric. When given just a symbol, the default dimension label will be used for the dimension.
+
+You may pass a hash instead of a symbol to customize the dimension options (example: { dimension_name: { option1: value, option2: value}}). The avaliable options are:
+
+- `field` - Specify the hierarchy level that should be used instead the default dimension label. Ex: `[:sales_rep, {mobile_phone: { field :manufacture }}]`. If you use a hash instead of a Symbol to define a hierarchy the `field` item must be a valid field in your table.
+
+- `name` - You may costumize the label alias, by default the dimension name will be used. The `name` can be whatever label you want. Ex :`[{sale_date: { field: :month, name: :a_custom_name_for_month }}]`.
+
+- `join_method` - You may choose the join_method with the dimension. The default value for join_method is :joins which does a standard "INNER JOIN", but you can pass a :left_outer_joins to use "LEFT OUTER JOIN" instead. Ex: `[{sales_rep: { join_method: :left_outer_joins }}]`
+
+- `datetime_drill` - To drill up and down over datetime column you may pass a `datetime_drill`. Ex: `[:sales_rep, { order: { field: :created_at, datetime_drill: :month }}]`. This option will perform an implicit drill over datetime columns and not a date dimension relationship.
 
 `dimension_filter` - A hash were the keys are dimension filter names and the values are the values passed into the filter.
 
@@ -303,7 +331,7 @@ end
 my_metric = ActiveReporting::Metric.new(
   :my_total,
   fact_model: UserFactModel,
-  dimensions: [{ created_at: :quarter } ]
+  dimensions: [{ created_at: { datetime_drill: :quarter }} ]
 )
 ```
 
@@ -313,20 +341,20 @@ A `Report` takes an `ActiveReporting::Metric` and ties everything together. It i
 
 ```ruby
 metric = ActiveReporting::Metric.new(
-  :order_count,
-  fact_model: OrderFactModel,
+  :sale_count,
+  fact_model: SaleFactModel,
   dimensions: [:sales_rep],
   dimension_filter: {months_ago: 1}
 )
 
 report = ActiveReporting::Report.new(metric)
 report.run
-=> [{order_count: 12, sales_rep: 'Fred Jones', sales_rep_identifier: 123},{order_count: 17, sales_rep: 'Mary Sue', sales_rep_identifier: 123}]
+=> [{sale_count: 12, sales_rep: 'Fred Jones', sales_rep_identifier: 123},{sale_count: 17, sales_rep: 'Mary Sue', sales_rep_identifier: 123}]
 ```
 
 A `Report` may also take additional arguments to merge with the `Metric`'s information. This can be user input for additional filters, or to expand on a base `Metric`.
 
-`dimension_identifiers` - When true, the result will include the database identifier columns of the dimensions. For example, when running a report for the total number of orders dimensioned by sales rep, the rep's IDs from the `sales_reps` table will be included. (Default `true`)
+`dimension_identifiers` - When true, the result will include the database identifier columns of the dimensions. For example, when running a report for the total number of sales dimensioned by sales rep, the rep's IDs from the `sales_reps` table will be included. (Default `true`)
 
 `dimension_filter` - A hash that will be merged with the `Metric`'s dimension filters.
 
@@ -336,15 +364,15 @@ A `Report` may also take additional arguments to merge with the `Metric`'s infor
 
 ```ruby
 metric = ActiveReporting::Metric.new(
-  :order_count,
-  fact_model: OrderFactModel,
+  :sale_count,
+  fact_model: SaleFactModel,
   dimensions: [:sales_rep],
   dimension_filter: {months_ago: 1}
 )
 
-report = ActiveReporting.new(metric, dimension_filter: {from_region: 'North'}, dimension_identifiers: false)
+report = ActiveReporting::Report.new(metric, dimension_filter: {from_region: 'North'}, dimension_identifiers: false)
 report.run
-=> [{order_count: 17, sales_rep: 'Mary Sue'}]
+=> [{sale_count: 17, sales_rep: 'Mary Sue'}]
 ```
 
 It may be more DRY to store ready-made metrics in a database table or stored in memory to use as the bases for various reports. You can pass a string or symbol into a `Report` instead of a `Metric` to look up an pre-made metric. This is done by passing the symbol or string into the `lookup` class method on the constant defined in `ActiveReporting::Configuration.metric_lookup_class`.
@@ -376,7 +404,6 @@ appropriate `DB` environment variable, e.g. `DB=pg rake test`.
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/active_reporting. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/active_reporting.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'activerecord', '>= 4.2.0'
-  spec.add_dependency 'activesupport', '>= 4.2.0'
+  spec.add_dependency 'activerecord'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'ransack'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/active_reporting.rb

@@ -41,4 +41,5 @@ module ActiveReporting
   UnknownDimension        = Class.new(StandardError)
   UnknownDimensionFilter  = Class.new(StandardError)
   UnknownMetric           = Class.new(StandardError)
+  UnknownJoinMethod       = Class.new(StandardError)
 end

data/lib/active_reporting/dimension.rb

@@ -30,13 +30,6 @@ module ActiveReporting
                 end
     end
 
-    # Whether the dimension is a datetime column
-    #
-    # @return [Boolean]
-    def datetime?
-      @datetime ||= type == TYPES[:degenerate] && model.column_for_attribute(@name).type == :datetime
-    end
-
     # Tells if the dimension is hierarchical
     #
     # @return [Boolean]

data/lib/active_reporting/fact_model.rb

@@ -85,6 +85,7 @@ module ActiveReporting
     #
     # @return [Symbol]
     def self.dimension_label
+      @dimension_label ||= nil
       @dimension_label || Configuration.default_dimension_label
     end
 
@@ -155,6 +156,7 @@ module ActiveReporting
     #
     # @return [Boolean]
     def self.ransack_fallback
+      @ransack_fallback ||= false
       @ransack_fallback || Configuration.ransack_fallback
     end
     private_class_method :ransack_fallback

data/lib/active_reporting/report.rb

@@ -36,7 +36,7 @@ module ActiveReporting
     private ######################################################################
 
     def build_data
-      @data = model.connection.exec_query(statement.to_sql).to_hash
+      @data = model.connection.exec_query(statement.to_sql).to_a
       apply_dimension_callbacks
       @data
     end
@@ -52,7 +52,8 @@ module ActiveReporting
     def statement
       parts = {
         select: select_statement,
-        joins: dimension_joins,
+        joins: dimension_joins(ReportingDimension::JOIN_METHODS[:joins]),
+        left_outer_joins: dimension_joins(ReportingDimension::JOIN_METHODS[:left_outer_joins]),
         group: group_by_statement,
         having: having_statement,
         order: order_by_statement
@@ -84,8 +85,9 @@ module ActiveReporting
       end
     end
 
-    def dimension_joins
-      @dimensions.select { |d| d.type == :standard }.map { |d| d.name.to_sym }
+    def dimension_joins(join_method)
+      @dimensions.select { |d| d.type == Dimension::TYPES[:standard] && d.join_method == join_method }.
+                  map { |d| d.name.to_sym }
     end
 
     def group_by_statement
@@ -142,8 +144,9 @@ module ActiveReporting
       @dimensions.each do |dimension|
         callback = dimension.label_callback
         next unless callback
+        key = "#{dimension.name}_#{dimension.label}"
         @data.each do |hash|
-          hash[dimension.name.to_s] = callback.call(hash[dimension.name.to_s])
+          hash[key] = callback.call(hash[key])
         end
       end
     end

data/lib/active_reporting/reporting_dimension.rb

@@ -4,27 +4,63 @@ require 'forwardable'
 module ActiveReporting
   class ReportingDimension
     extend Forwardable
-    SUPPORTED_DBS = %w[PostgreSQL PostGIS].freeze
+    SUPPORTED_DBS = %w[PostgreSQL PostGIS Mysql2].freeze
     # Values for the Postgres `date_trunc` method.
     # See https://www.postgresql.org/docs/10/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
     DATETIME_HIERARCHIES = %i[microseconds milliseconds second minute hour day week month quarter year decade
                               century millennium].freeze
-    def_delegators :@dimension, :name, :type, :klass, :association, :model, :hierarchical?, :datetime?
+    JOIN_METHODS = { joins: :joins, left_outer_joins: :left_outer_joins }.freeze
+    attr_reader :join_method, :label
+
+    def_delegators :@dimension, :name, :type, :klass, :association, :model, :hierarchical?
 
     def self.build_from_dimensions(fact_model, dimensions)
       Array(dimensions).map do |dim|
-        dimension_name, label = dim.is_a?(Hash) ? Array(dim).flatten : [dim, nil]
+        dimension_name, options = dim.is_a?(Hash) ? Array(dim).flatten : [dim, nil]
         found_dimension = fact_model.dimensions[dimension_name.to_sym]
-        raise UnknownDimension, "Dimension '#{dim}' not found on fact model '#{fact_model}'" if found_dimension.nil?
-        new(found_dimension, label: label)
+
+        raise(UnknownDimension, "Dimension '#{dimension_name}' not found on fact model '#{fact_model}'") if found_dimension.nil?
+
+        # Ambiguous behavior with string option for degenerate and standard dimension
+        if !options.is_a?(Hash) && found_dimension.type == Dimension::TYPES[:degenerate]
+          ActiveSupport::Deprecation.warn <<~EOS
+            direct use of implict hierarchies is deprecated and will be removed in future versions. \
+            Please use `:datetime_drill` option instead.
+          EOS
+          options = { datetime_drill: options }
+        end
+        new(found_dimension, **label_config(options))
+      end
+    end
+
+    # If you pass a symbol it means you just indicate
+    # the field on that dimension. With a hash you can
+    # customize the name of the label
+    #
+    # @param [Symbol|Hash] options
+    def self.label_config(options)
+      unless options.is_a?(Hash)
+        return { label: options }
       end
+
+      {
+        label: options[:field],
+        label_name: options[:name],
+        join_method: options[:join_method],
+        datetime_drill: options[:datetime_drill]
+      }
     end
 
     # @param dimension [ActiveReporting::Dimension]
-    # @option label [Symbol] Hierarchical dimension to be used as a label
-    def initialize(dimension, label: nil)
+    # @option label [Maybe<Symbol>] Hierarchical dimension to be used as a label
+    # @option label_name [Maybe<Symbol|String>] Hierarchical dimension custom name
+    def initialize(dimension, label: nil, label_name: nil, join_method: nil, datetime_drill: nil)
       @dimension = dimension
-      determine_label(label)
+
+      determine_label_field(label)
+      determine_datetime_drill(datetime_drill)
+      determine_label_name(label_name)
+      determine_join_method(join_method)
     end
 
     # The foreign key to use in queries
@@ -38,10 +74,8 @@ module ActiveReporting
     #
     # @return [Array]
     def select_statement(with_identifier: true)
-      return [degenerate_select_fragment] if type == Dimension::TYPES[:degenerate]
-
-      ss = ["#{label_fragment} AS #{name}"]
-      ss << "#{identifier_fragment} AS #{name}_identifier" if with_identifier
+      ss = ["#{label_fragment} AS #{label_fragment_alias}"]
+      ss << "#{identifier_fragment} AS #{identifier_fragment_alias}" if with_identifier && type == Dimension::TYPES[:standard]
       ss
     end
 
@@ -49,10 +83,8 @@ module ActiveReporting
     #
     # @return [Array]
     def group_by_statement(with_identifier: true)
-      return [degenerate_fragment] if type == Dimension::TYPES[:degenerate]
-
       group = [label_fragment]
-      group << identifier_fragment if with_identifier
+      group << identifier_fragment if with_identifier && type == Dimension::TYPES[:standard]
       group
     end
 
@@ -62,7 +94,6 @@ module ActiveReporting
     def order_by_statement(direction:)
       direction = direction.to_s.upcase
       raise "Ording direction should be 'asc' or 'desc'" unless %w[ASC DESC].include?(direction)
-      return "#{degenerate_fragment} #{direction}" if type == Dimension::TYPES[:degenerate]
       "#{label_fragment} #{direction}"
     end
 
@@ -75,22 +106,49 @@ module ActiveReporting
 
     private ####################################################################
 
-    def determine_label(label)
-      @label = if label.present? && validate_hierarchical_label(label)
-                 label.to_sym
+    def determine_label_field(label_field)
+      @label = if label_field.present? && validate_hierarchical_label(label_field)
+                 type == Dimension::TYPES[:degenerate] ? name : label_field.to_sym
+               elsif type == Dimension::TYPES[:degenerate]
+                 name
                else
                  dimension_fact_model.dimension_label || Configuration.default_dimension_label
                end
     end
 
-    def validate_hierarchical_label(hierarchical_label)
-      if datetime?
-        validate_supported_database_for_datetime_hierarchies
-        validate_against_datetime_hierarchies(hierarchical_label)
+    def determine_label_name(label_name)
+
+      if label_name
+        @label_name = label_name
       else
-        validate_dimension_is_hierachical(hierarchical_label)
-        validate_against_fact_model_properties(hierarchical_label)
+        @label_name = name
+        @label_name += "_#{@label}" if (type == Dimension::TYPES[:standard] && @label != :name)
+        @label_name += "_#{@datetime_drill}" if @datetime_drill
       end
+      @label_name
+    end
+
+    def determine_datetime_drill(datetime_drill)
+      return unless datetime_drill
+      validate_supported_database_for_datetime_hierarchies
+      validate_against_datetime_hierarchies(datetime_drill)
+      validate_label_is_datetime
+      @datetime_drill = datetime_drill
+    end
+
+    def determine_join_method(join_method)
+      if join_method.blank?
+        @join_method = ReportingDimension::JOIN_METHODS[:joins]
+      elsif ReportingDimension::JOIN_METHODS.include?(join_method)
+        @join_method = join_method
+      else
+        raise UnknownJoinMethod, "Method '#{join_method}' not included in '#{ReportingDimension::JOIN_METHODS.values}'"
+      end
+    end
+
+    def validate_hierarchical_label(hierarchical_label)
+      validate_dimension_is_hierachical(hierarchical_label)
+      validate_against_fact_model_properties(hierarchical_label)
       true
     end
 
@@ -111,27 +169,75 @@ module ActiveReporting
       raise InvalidDimensionLabel, "#{hierarchical_label} is not a valid datetime grouping label in #{name}"
     end
 
+    def validate_label_is_datetime
+      return if dimension_fact_model.model.column_for_attribute(@label).type == :datetime
+      raise InvalidDimensionLabel, "'#{@label}' is not a datetime column"
+    end
+
     def validate_against_fact_model_properties(hierarchical_label)
       return if dimension_fact_model.hierarchical_levels.include?(hierarchical_label.to_sym)
       raise InvalidDimensionLabel, "#{hierarchical_label} is not a hierarchical label in #{name}"
     end
 
-    def degenerate_fragment
-      return "#{name}_#{@label}" if datetime?
-      "#{model.quoted_table_name}.#{name}"
+    def datetime_drill_label_fragment(column)
+      if model.connection.adapter_name == "Mysql2"
+        datetime_drill_mysql(column)
+      else # Postgress
+        datetime_drill_postgress(column)
+      end
     end
 
-    def degenerate_select_fragment
-      return "DATE_TRUNC('#{@label}', #{model.quoted_table_name}.#{name}) AS #{name}_#{@label}" if datetime?
-      "#{model.quoted_table_name}.#{name}"
+    def datetime_drill_postgress(column)
+      "DATE_TRUNC('#{@datetime_drill}', #{column})"
+    end
+
+    def datetime_drill_mysql(column)
+      case @datetime_drill.to_sym
+      when :microseconds
+        "MICROSECOND(#{column})"
+      when :milliseconds
+        "MICROSECOND(#{column}) DIV 1000"
+      when :second
+        "SECOND(#{column})"
+      when :minute
+        "MINUTE(#{column})"
+      when :hour
+        "HOUR(#{column})"
+      when :day
+        "DAY(#{column})"
+      when :week
+        "WEEKDAY(#{column})"
+      when :month
+        "MONTH(#{column})"
+      when :quarter
+        "QUARTER(#{column})"
+      when :year
+        "YEAR(#{column})"
+      when :decade
+        "YEAR(#{column}) DIV 10"
+      when :century
+        "YEAR(#{column}) DIV 100"
+      when :millennium
+        "YEAR(#{column}) DIV 1000"
+      end
     end
 
     def identifier_fragment
-      "#{klass.quoted_table_name}.#{klass.primary_key}"
+      "#{klass.quoted_table_name}.#{model.connection.quote_column_name(klass.primary_key)}"
+    end
+
+    def identifier_fragment_alias
+      "#{model.connection.quote_column_name("#{name}_identifier")}"
     end
 
     def label_fragment
-      "#{klass.quoted_table_name}.#{@label}"
+      fragment = "#{klass.quoted_table_name}.#{model.connection.quote_column_name(@label)}"
+      fragment = datetime_drill_label_fragment(fragment) if @datetime_drill
+      fragment
+    end
+
+    def label_fragment_alias
+      "#{model.connection.quote_column_name(@label_name)}"
     end
 
     def dimension_fact_model

data/lib/active_reporting/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveReporting
-  VERSION = '0.4.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_reporting
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tony Drake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -185,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add relational OLAP-like functionality for ActiveRecord