chicagowarehouse 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a54a10415694e7c293cf98d338f1ec7e29343cc
-  data.tar.gz: 65d485e97187351d7dc90cada98956f43a424eb9
+  metadata.gz: 0d1ffe55091b2b8fac1433fc50fef9671530f206
+  data.tar.gz: 480006599cc1e0cf41dc81c939f708c23df47697
 SHA512:
-  metadata.gz: f3412a1bf3b456d3e1c47e36990366144390ea6a85d78f753f35e6fb76ab441ecd3bc6ccf024e205231405a25b01a80aae36f2144a807a9f7dadab8488d0926a
-  data.tar.gz: ca7b1e11af675ce66af8c81511f34768c00072cc277f2925548916165ca15736cf43fa49e68467111da6b767c925cd527cc98544cbaa2fc3f296603b864e6c19
+  metadata.gz: 7683d3c320d51fd44bc56e4071327a459b1484677c0c28221b156209a57a515d2a41198fc6f0e549aa4cda672e966c785f6de96df11cb2b5e2d8a081561bd25c
+  data.tar.gz: 805ac03ef39232f596cc8ce254d7d0cc7daace567f7bbb8ea7a1477077875f86f1705986381b05ae590d47eae3288055b45212ba471d27e719472895e2212cc4

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name              = "chicagowarehouse"
-  gem.version           = "0.6.6"
+  gem.version           = "0.6.7"
   gem.summary           = "Ruby Data Warehousing"
   gem.description       = "Simple Data Warehouse toolkit for ruby"
   gem.author            = "Roland Swingler"

data/chicagowarehouse.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: chicagowarehouse 0.6.6 ruby lib
+# stub: chicagowarehouse 0.6.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chicagowarehouse"
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/database/schema_generator_spec.rb",
     "spec/db_connections.yml.dist",
     "spec/query_spec.rb",
+    "spec/schema/column_parser_spec.rb",
     "spec/schema/column_spec.rb",
     "spec/schema/dimension_builder_spec.rb",
     "spec/schema/dimension_reference_spec.rb",

data/lib/chicago/schema/column_parser.rb

@@ -93,8 +93,8 @@ module Chicago
       end
 
       def simple_column(elem)
-        table, col = parse_parts(elem)
-        QueryColumn.column(table, col, elem.to_sym)
+        table, col, table_qualifier = parse_parts(elem)
+        QueryColumn.column(table, col, elem.to_sym, table_qualifier)
       end
   
       def calculated_column(elem)
@@ -111,9 +111,10 @@ module Chicago
         if col.kind_of?(Chicago::Schema::Dimension)
           table = col
           col = parts.empty? ? table : table[parts.first]
+          table_qualifier = table.label if table.roleplayed?
         end
 
-        [table, col]
+        [table, col, table_qualifier]
       end
 
       def parse_table(str)

data/lib/chicago/schema/dimension_reference.rb

@@ -40,6 +40,14 @@ module Chicago
         database_name.qualify(table)
       end
 
+      # Returns true if this dimension reference is roleplayed -
+      # i.e. it has a different name from the underlying dimension so
+      # that, for example, multiple date dimensions can be assigned to
+      # the same fact table.
+      def roleplayed?
+        name != @dimension.name
+      end
+
       # Returns the first null record id for this dimension, or 0 if
       # the dimension has no null records defined.
       def default_value

data/lib/chicago/schema/query_column.rb

@@ -14,8 +14,9 @@ module Chicago
       end
 
       # @private
-      def initialize(column)
+      def initialize(column, table_label=nil)
         @column = column
+        @table_label = table_label
       end
 
       # @private
@@ -23,21 +24,32 @@ module Chicago
         @column.send(*args, &block)
       end
 
+      # Returns the label for this column.
+      #
+      # The label is qualified by the table name if neccessary
+      # (i.e. if the column comes from a dimension which features
+      # multiple times in the same fact table).
+      def qualified_label
+        @table_label ? "#{label} (#{@table_label})" : label
+      end
+
       # Factory method that returns a query column.
       #
       # @param owner the column owner, normally a fact or dimension
       # @param column the wrapped column
       # @param column_alias the reference to this column as used by
       #   the column parser.
-      def self.column(owner, column, column_alias)
+      # @param table_label a table name to distinguish this column
+      #   from and identically named one. May be nil.
+      def self.column(owner, column, column_alias, table_label)
         if column.kind_of?(Chicago::Schema::Dimension)
           DimensionAsColumn.new(owner, column, column_alias)
         elsif owner.kind_of?(Chicago::Schema::Dimension) && owner.identifiable? && owner.identifiers.include?(column.name)
           DimensionIdentifierColumn.new(owner, column, column_alias)
         elsif column.calculated?
-          VirtualColumn.new(owner, column, column_alias)
+          VirtualColumn.new(owner, column, column_alias, table_label)
         else
-          QualifiedColumn.new(owner, column, column_alias)
+          QualifiedColumn.new(owner, column, column_alias, table_label)
         end
       end
 
@@ -48,8 +60,8 @@ module Chicago
 
     # @abstract
     class AbstractQualifiedColumn < QueryColumn
-      def initialize(owner, column, column_alias)
-        super column
+      def initialize(owner, column, column_alias, table_label=nil)
+        super column, table_label
         @owner = owner
         @column_alias = column_alias
       end
@@ -85,7 +97,7 @@ module Chicago
     end
     
     class QualifiedColumn < AbstractQualifiedColumn
-      def initialize(owner, column, column_alias)
+      def initialize(owner, column, column_alias, table_label)
         super
         @select_name = @column.name.qualify(@owner.name)
         @count_name = @select_name
@@ -100,8 +112,8 @@ module Chicago
     # - filters will appear in the HAVING clause, not the WHERE clause
     # of the SQL statement.
     class VirtualColumn < QualifiedColumn
-      def initialize(owner, column, column_alias)
-        super(owner, column, column_alias)
+      def initialize(owner, column, column_alias, table_label)
+        super
         @select_name = @column.calculation
       end
 

data/spec/schema/column_parser_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Chicago::Schema::ColumnParser do
+  let(:schema) do
+    schema = Chicago::StarSchema.new
+
+    schema.define_dimension(:date) do
+      columns do
+        string :day
+      end
+    end
+
+    schema.define_dimension(:product) do
+      columns do
+        string :name
+      end
+    end
+
+    schema.define_fact(:sales) do
+      dimensions :product, :date.as(:order_date), :date.as(:refund_date)
+    end
+
+    schema
+  end
+
+  subject { described_class.new(schema) }
+
+  it "has a qualified label for roleplayed dimensions" do
+    column = subject.parse("sales.order_date.day").first
+    expect(column.label).to eql("Day")
+    expect(column.qualified_label).to eql("Day (Order Date)")
+  end
+
+  it "has a non-qualified label for non-roleplayed dimensions" do
+    column = subject.parse("sales.product.name").first
+
+    expect(column.qualified_label).to eql("Name")
+  end
+end

data/spec/schema/dimension_reference_spec.rb

@@ -98,6 +98,11 @@ describe Chicago::Schema::DimensionReference do
     described_class.new(:foo, @dimension).default_value.should == 1
   end
 
+  it "knows whether it is a roleplayed dimension or not" do
+    expect(described_class.new(:bar, @dimension)).to_not be_roleplayed
+    expect(described_class.new(:foo, @dimension)).to be_roleplayed
+  end
+
   it "is visitable" do
     visitor = double(:visitor)
     column = described_class.new(:foo, @dimension)

data/spec/schema/query_column_spec.rb

@@ -5,7 +5,7 @@ describe Chicago::Schema::QueryColumn do
   describe "a standard column" do
     let(:owner) { double(:owner).as_null_object }
     let(:column) { double(:column, :calculated? => false).as_null_object }
-    subject { described_class.column(owner, column, "foo.bar") }
+    subject { described_class.column(owner, column, "foo.bar", nil) }
 
     it "should have a column alias" do
       subject.column_alias.should == "foo.bar"
@@ -41,7 +41,7 @@ describe Chicago::Schema::QueryColumn do
     let(:calculation) { double(:calculation).as_null_object }
     let(:owner) { double(:owner).as_null_object }
     let(:column) { double(:column, :calculated? => true, :calculation => calculation).as_null_object }
-    subject { described_class.column(owner, column, "foo.bar") }
+    subject { described_class.column(owner, column, "foo.bar", nil) }
 
     it "should have a column alias" do
       subject.column_alias.should == "foo.bar"
@@ -70,7 +70,7 @@ describe Chicago::Schema::QueryColumn do
   describe "a dimension column" do
     let(:owner) { double(:owner).as_null_object }
     let(:column) { double(:column).as_null_object }
-    subject { described_class.column(owner, column, "foo.bar") }
+    subject { described_class.column(owner, column, "foo.bar", nil) }
 
     before :each do
       column.stub(:main_identifier).and_return(:name)
@@ -110,7 +110,7 @@ describe Chicago::Schema::QueryColumn do
   describe "a dimension identifier column" do
     let(:owner) { double(:owner).as_null_object }
     let(:column) { double(:column).as_null_object }
-    subject { described_class.column(owner, column, "foo.bar") }
+    subject { described_class.column(owner, column, "foo.bar", nil) }
 
     before :each do
       column.stub(:name).and_return(:bar)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chicagowarehouse
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Roland Swingler
@@ -216,6 +216,7 @@ files:
 - spec/database/schema_generator_spec.rb
 - spec/db_connections.yml.dist
 - spec/query_spec.rb
+- spec/schema/column_parser_spec.rb
 - spec/schema/column_spec.rb
 - spec/schema/dimension_builder_spec.rb
 - spec/schema/dimension_reference_spec.rb