mondrian-olap 1.2.0 → 1.3.0

data/spec/query_spec.rb

@@ -101,7 +101,7 @@ describe "Query" do
     end
 
     it "should return formatted cells" do
-      @result.formatted_values.map{|r| r.map{|s| BigDecimal.new(s.gsub(',',''))}}.should == @expected_result_values
+      @result.formatted_values.map{|r| r.map{|s| BigDecimal(s.gsub(',',''))}}.should == @expected_result_values
     end
 
   end
@@ -703,6 +703,11 @@ describe "Query" do
           execute
         result.values.should == sql_select_numbers(@sql_select)
       end
+
+      it "should not fail without columns" do
+        result = @query.rows('[Product].DefaultMember').execute
+        result.values.should == [[]]
+      end
     end
 
     describe "result HTML formatting" do
@@ -713,14 +718,6 @@ describe "Query" do
           execute
         Nokogiri::HTML.fragment(result.to_html).css('tr').size.should == (sql_select_numbers(@sql_select).size + 1)
       end
-
-      # it "test" do
-      #   puts @olap.from('Sales').
-      #     columns('[Product].children').
-      #     rows('[Customers].[USA].[CA].children').
-      #     where('[Time].[2010].[Q1]', '[Measures].[Store Sales]').
-      #     execute.to_html
-      # end
     end
 
   end
@@ -842,15 +839,6 @@ describe "Query" do
             String,
             BigDecimal
           ]
-        when 'mssql'
-          [
-            Integer, String, Integer, Integer, Integer,
-            String, String, String, String, String, String,
-            # last one can be BigDecimal or Integer, probably depends on MS SQL version
-            String, String, String, Numeric,
-            String,
-            BigDecimal
-          ]
         else
           [
             Integer, String, Integer, Integer, Integer,
@@ -896,6 +884,25 @@ describe "Query" do
       ]
     end
 
+    it "should return rows also for field dimension that is not present in the report query" do
+      result = @olap.from('Sales').columns('[Measures].[Unit Sales]').rows('[Customers].[Canada].[BC].[Burnaby]').execute
+      drill_through = result.drill_through(row: 0, column: 0, return: ["[Product].[Product Family]"])
+      drill_through.rows.should == @sql.select_rows(<<-SQL)
+        SELECT
+          product_classes.product_family
+        FROM
+          sales,
+          products,
+          product_classes,
+          customers
+        WHERE
+          products.product_class_id = product_classes.id AND
+          sales.product_id = products.id AND
+          sales.customer_id = customers.id AND
+          customers.country = 'Canada' AND customers.state_province = 'BC' AND customers.city = 'Burnaby'
+      SQL
+    end
+
     it "should return only nonempty measures" do
       @drill_through = @result.drill_through(:row => 0, :column => 0,
         :return => "[Measures].[Unit Sales], [Measures].[Store Sales]",
@@ -904,7 +911,7 @@ describe "Query" do
       @drill_through.column_labels.should == [
         "Unit Sales", "Store Sales"
       ]
-      @drill_through.rows.all?{|r| r.any?{|c| c}}.should be_true
+      @drill_through.rows.all?{|r| r.any?{|c| c}}.should == true
     end
 
     it "should return member name and property values" do
@@ -913,12 +920,12 @@ describe "Query" do
           "Name([Customers].[Name])",
           "Property([Customers].[Name], 'Gender')",
           "Property([Customers].[Name], 'Description')",
-          "Property([Customers].[Name], 'Very long non-existing property name')"
+          "Property([Customers].[Name], 'Non-existing property name')"
         ]
       )
       @drill_through.column_labels.should == [
         "Name", "Gender", "Description",
-        "Very long non-existing property name"[0, MONDRIAN_DRIVER == 'oracle' ? 30 : 9999]
+        "Non-existing property name"
       ]
       @drill_through.rows.should == @sql.select_rows(<<-SQL)
         SELECT
@@ -981,6 +988,64 @@ describe "Query" do
     end
   end
 
+  describe "drill through cell with return and role restrictions" do
+    before(:all) do
+      @olap.role_name = "Canada manager"
+      @query = @olap.from('Sales')
+      @result = @query.columns('[Measures].[Unit Sales]').
+        rows('[Customers].[All Customers]').
+        execute
+    end
+
+    after(:all) do
+      @olap.role_name = nil
+    end
+
+    it "should return data according to role restriction" do
+      @drill_through = @result.drill_through(:row => 0, :column => 0, :return => [
+        '[Customers].[Country]',
+        '[Measures].[Unit Sales]'
+      ])
+      @drill_through.rows.all? { |r| r.first == "Canada" }.should == true
+    end
+  end
+
+  describe "drill through virtual cube cell with return" do
+    before(:all) do
+      @query = @olap.from('Sales and Warehouse')
+      @result = @query.columns(
+          '[Measures].[Unit Sales]', '[Measures].[Store Sales]',
+          '[Measures].[Units Shipped]', '[Measures].[Products with units shipped]'
+        ).
+        rows('[Product].children').
+        where('[Time].[2010].[Q1]', '[Time].[2010].[Q2]').
+        execute
+    end
+
+    it "should return specified fields from other cubes as empty strings" do
+      @drill_through = @result.drill_through(:row => 0, :column => 3, :return => [
+        '[Time].[Month]',
+        '[Product].[Product Family]',
+        '[Customers].[City]', # missing in Warehouse cube
+        '[Measures].[Unit Sales]', # missing in Warehouse cube
+        '[Measures].[Units Shipped]',
+        '[Measures].[Products with units shipped]'
+      ])
+      @drill_through.column_labels.should == [
+        "Month (Key)",
+        "Product Family (Key)",
+        "City (Key)",
+        "Unit Sales",
+        "Units Shipped",
+        "Products with units shipped"
+      ]
+      # Validate that only City and Unit Sales values are missing
+      @drill_through.rows.map { |r| r.map(&:present?) }.uniq.should == [
+        [true, true, false, false, true, true]
+      ]
+    end
+  end
+
   describe "drill through statement" do
     before(:all) do
       @query = @olap.from('Sales').

data/spec/rake_tasks.rb

@@ -5,10 +5,12 @@ namespace :db do
     require File.expand_path("../spec_helper", __FILE__)
   end
 
+  import_data_drivers = %w(vertica snowflake clickhouse mariadb)
+
   desc "Create test database tables"
   task :create_tables => :require_spec_helper do
     puts "==> Creating tables for test data"
-    ActiveRecord::Schema.define do
+    ActiveRecord::Schema.instance_eval do
 
       create_table :time, :force => true do |t|
         t.datetime    :the_date
@@ -34,7 +36,10 @@ namespace :db do
         t.string      :product_family, :limit => 30
       end
 
-      create_table :customers, :force => true do |t|
+      customers_options = {force: true}
+      customers_options[:id] = false if import_data_drivers.include?(MONDRIAN_DRIVER)
+      create_table :customers, **customers_options do |t|
+        t.integer     :id, :limit => 8 if import_data_drivers.include?(MONDRIAN_DRIVER)
         t.string      :country, :limit => 30
         t.string      :state_province, :limit => 30
         t.string      :city, :limit => 30
@@ -42,6 +47,7 @@ namespace :db do
         t.string      :lname, :limit => 30
         t.string      :fullname, :limit => 60
         t.string      :gender, :limit => 30
+        t.date        :birthdate
         t.integer     :promotion_id
         t.string      :related_fullname, :limit => 60
         # Mondrian does not support properties with Oracle CLOB type
@@ -79,7 +85,7 @@ namespace :db do
         execute "ALTER TABLE customers MODIFY COLUMN id BIGINT NOT NULL AUTO_INCREMENT"
       when /postgresql/
         execute "ALTER TABLE customers ALTER COLUMN id SET DATA TYPE bigint"
-      when /mssql|sqlserver/
+      when /sqlserver/
         sql = "SELECT name FROM sysobjects WHERE xtype = 'PK' AND parent_obj=OBJECT_ID('customers')"
         primary_key_constraint = select_value(sql)
         execute "ALTER TABLE customers DROP CONSTRAINT #{primary_key_constraint}"
@@ -90,11 +96,23 @@ namespace :db do
       create_table :sales, :force => true, :id => false do |t|
         t.integer     :product_id
         t.integer     :time_id
-        t.integer     :customer_id
+        t.integer     :customer_id, limit: MONDRIAN_DRIVER == 'sqlserver' ? nil : 8
         t.integer     :promotion_id
-        t.decimal     :store_sales, :precision => 10, :scale => 4
-        t.decimal     :store_cost, :precision => 10, :scale => 4
-        t.decimal     :unit_sales, :precision => 10, :scale => 4
+        t.decimal     :store_sales, precision: 10, scale: 4
+        t.decimal     :store_cost, precision: 10, scale: 4
+        t.decimal     :unit_sales, precision: 10, scale: 4
+      end
+
+      case MONDRIAN_DRIVER
+      when /sqlserver/
+        execute "ALTER TABLE sales ALTER COLUMN customer_id BIGINT"
+      end
+
+      create_table :warehouse, :force => true, :id => false do |t|
+        t.integer     :product_id
+        t.integer     :time_id
+        t.integer     :units_shipped
+        t.decimal     :store_invoice, precision: 10, scale: 4
       end
     end
   end
@@ -128,11 +146,17 @@ namespace :db do
       belongs_to :product
       belongs_to :customer
     end
+    class Warehouse < ActiveRecord::Base
+      self.table_name = "warehouse"
+      belongs_to :time_by_day
+      belongs_to :product
+    end
   end
 
   desc "Create test data"
-  task :create_data => [:create_tables] + ( %w(vertica snowflake).include?(ENV['MONDRIAN_DRIVER']) ? [:import_data] :
-    [ :create_time_data, :create_product_data, :create_promotion_data, :create_customer_data, :create_sales_data ] )
+  task :create_data => [:create_tables] + (import_data_drivers.include?(ENV['MONDRIAN_DRIVER']) ? [:import_data] :
+    [ :create_time_data, :create_product_data, :create_promotion_data, :create_customer_data, :create_sales_data,
+      :create_warehouse_data ] )
 
   task :create_time_data  => :define_models do
     puts "==> Creating time dimension"
@@ -217,6 +241,7 @@ namespace :db do
         :lname => "Last#{i}",
         :fullname => "First#{i} Last#{i}",
         :gender => i % 2 == 0 ? "M" : "F",
+        :birthdate => Date.new(1970, 1, 1) + i,
         :promotion_id => promotions[i % 10].id,
         :related_fullname => "First#{i} Last#{i}",
         :description => 100.times.map{"1234567890"}.join("\n")
@@ -236,10 +261,10 @@ namespace :db do
       :related_fullname => "Big Number"
     }
     case MONDRIAN_DRIVER
-    when /mssql|sqlserver/
-      Customer.connection.with_identity_insert_enabled("customers") do
-        Customer.create!(attributes)
-      end
+    when 'sqlserver'
+      Customer.connection.execute "SET IDENTITY_INSERT customers ON"
+      Customer.create!(attributes)
+      Customer.connection.execute "SET IDENTITY_INSERT customers OFF"
     else
       Customer.create!(attributes)
     end
@@ -266,8 +291,24 @@ namespace :db do
     end
   end
 
+  task :create_warehouse_data => :define_models do
+    puts "==> Creating warehouse data"
+    Warehouse.delete_all
+    count = 100
+    products = Product.order("id").to_a[0...count]
+    times = TimeDimension.order("id").to_a[0...count]
+    count.times do |i|
+      Warehouse.create!(
+        :product_id => products[i].id,
+        :time_id => times[i].id,
+        :units_shipped => i+1,
+        :store_invoice => BigDecimal("1#{i}.1234")
+      )
+    end
+  end
+
   export_data_dir = File.expand_path("spec/support/data")
-  table_names = %w(time product_classes products customers sales)
+  table_names = %w(time product_classes products customers promotions sales warehouse)
 
   desc "Export test data"
   task :export_data => :create_data do
@@ -330,13 +371,41 @@ namespace :db do
           "FILE_FORMAT = (FORMAT_NAME = csv)"
         puts "==> Loaded #{count} records"
       end
+
+    when 'clickhouse'
+      table_names.each do |table_name|
+        puts "==> Truncate #{table_name}"
+        conn.execute "TRUNCATE TABLE #{table_name}"
+        puts "==> Copy into #{table_name}"
+        file_path = "#{export_data_dir}/#{table_name}.csv"
+        columns_string = File.open(file_path) { |f| f.gets }.chomp
+        clickhouse_format_class = Java::com.clickhouse.data.ClickHouseFormat rescue Java::com.clickhouse.client.ClickHouseFormat
+        conn.jdbc_connection.createStatement.write.
+          query("INSERT INTO #{table_name}(#{columns_string})").
+          data(file_path).format(clickhouse_format_class::CSVWithNames).execute
+        count = conn.select_value("SELECT COUNT(*) FROM #{table_name}").to_i
+        puts "==> Loaded #{count} records"
+      end
+
+    when 'mariadb'
+      table_names.each do |table_name|
+        puts "==> Truncate #{table_name}"
+        conn.execute "TRUNCATE TABLE `#{table_name}`"
+        puts "==> Copy into #{table_name}"
+        file_path = "#{export_data_dir}/#{table_name}.csv"
+        columns_string = File.open(file_path) { |f| f.gets }.chomp
+        count = conn.execute "LOAD DATA LOCAL INFILE '#{file_path}' INTO TABLE `#{table_name}` CHARACTER SET UTF8 " \
+          "FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"' IGNORE 1 LINES (#{columns_string})"
+        puts "==> Loaded #{count} records"
+      end
+
     end
   end
 
 end
 
 namespace :spec do
-  %w(mysql jdbc_mysql postgresql oracle mssql sqlserver vertica snowflake).each do |driver|
+  %w(mysql jdbc_mysql postgresql oracle sqlserver vertica snowflake clickhouse mariadb).each do |driver|
     desc "Run specs with #{driver} driver"
     task driver do
       ENV['MONDRIAN_DRIVER'] = driver
@@ -347,7 +416,7 @@ namespace :spec do
 
   desc "Run specs with all primary database drivers"
   task :all do
-    %w(mysql jdbc_mysql postgresql oracle mssql).each do |driver|
+    %w(mysql jdbc_mysql postgresql oracle sqlserver).each do |driver|
       Rake::Task["spec:#{driver}"].invoke
     end
   end

data/spec/schema_definition_spec.rb

@@ -865,241 +865,6 @@ describe "Schema definition" do
       end
     end
 
-    describe "User defined functions and formatters in JavaScript" do
-      next pending "not supported by Mondrian in Java 8" if ENV_JAVA["java.version"] >= "1.8"
-
-      before(:each) do
-        @schema.define do
-          cube 'Sales' do
-            table 'sales'
-            dimension 'Customers', :foreign_key => 'customer_id' do
-              hierarchy :has_all => true, :all_member_name => 'All Customers', :primary_key => 'id' do
-                table 'customers'
-                level 'Name', :column => 'fullname' do
-                  member_formatter { javascript "return member.getName().toUpperCase();" }
-                  property 'City', :column => 'city' do
-                    property_formatter { javascript "return propertyValue.toUpperCase();" }
-                  end
-                end
-              end
-            end
-            calculated_member 'Factorial' do
-              dimension 'Measures'
-              formula 'Factorial(6)'
-              cell_formatter do
-                javascript <<-JS
-                  var s = value.toString();
-                  while (s.length < 20) {
-                    s = "0" + s;
-                  }
-                  return s;
-                JS
-              end
-            end
-            calculated_member 'City' do
-              dimension 'Measures'
-              formula "[Customers].CurrentMember.Properties('City')"
-            end
-          end
-          user_defined_function 'Factorial' do
-            javascript <<-JS
-              function getParameterTypes() {
-                return new Array(
-                  new mondrian.olap.type.NumericType());
-              }
-              function getReturnType(parameterTypes) {
-                return new mondrian.olap.type.NumericType();
-              }
-              function execute(evaluator, arguments) {
-                var n = arguments[0].evaluateScalar(evaluator);
-                return factorial(n);
-              }
-              function factorial(n) {
-                return n <= 1 ? 1 : n * factorial(n - 1);
-              }
-            JS
-          end
-        end
-        @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS.merge :schema => @schema)
-      end
-
-      it "should render XML" do
-        @schema.to_xml.should be_like <<-XML
-        <?xml version="1.0" encoding="UTF-8"?>
-        <Schema name="default">
-          <Cube name="Sales">
-            <Table name="sales"/>
-            <Dimension foreignKey="customer_id" name="Customers">
-              <Hierarchy allMemberName="All Customers" hasAll="true" primaryKey="id">
-                <Table name="customers"/>
-                <Level column="fullname" name="Name" uniqueMembers="true">
-                  <MemberFormatter>
-                    <Script language="JavaScript">return member.getName().toUpperCase();</Script>
-                  </MemberFormatter>
-                  <Property column="city" name="City">
-                    <PropertyFormatter>
-                      <Script language="JavaScript">return propertyValue.toUpperCase();</Script>
-                    </PropertyFormatter>
-                  </Property>
-                </Level>
-              </Hierarchy>
-            </Dimension>
-            <CalculatedMember dimension="Measures" name="Factorial">
-              <Formula>Factorial(6)</Formula>
-              <CellFormatter>
-                <Script language="JavaScript">
-                  var s = value.toString();
-                  while (s.length &lt; 20) {
-                    s = "0" + s;
-                  }
-                  return s;
-                </Script>
-              </CellFormatter>
-            </CalculatedMember>
-            <CalculatedMember dimension="Measures" name="City">
-              <Formula>[Customers].CurrentMember.Properties('City')</Formula>
-            </CalculatedMember>
-          </Cube>
-          <UserDefinedFunction name="Factorial">
-            <Script language="JavaScript">
-              function getParameterTypes() {
-                return new Array(
-                  new mondrian.olap.type.NumericType());
-              }
-              function getReturnType(parameterTypes) {
-                return new mondrian.olap.type.NumericType();
-              }
-              function execute(evaluator, arguments) {
-                var n = arguments[0].evaluateScalar(evaluator);
-                return factorial(n);
-              }
-              function factorial(n) {
-                return n &lt;= 1 ? 1 : n * factorial(n - 1);
-              }
-            </Script>
-          </UserDefinedFunction>
-        </Schema>
-        XML
-      end
-
-      it "should execute user defined function" do
-        result = @olap.from('Sales').columns('[Measures].[Factorial]').execute
-        value = 1*2*3*4*5*6
-        result.values.should == [value]
-        result.formatted_values.should == ["%020d" % value]
-      end
-
-      it "should format members and properties" do
-        result = @olap.from('Sales').columns('[Measures].[City]').rows('[Customers].[All Customers].Children').execute
-        result.row_members.each_with_index do |member, i|
-          member.caption.should == member.name.upcase
-          city = member.property_value('City')
-          result.formatted_values[i].first.should == city
-          member.property_formatted_value('City').should == city.upcase
-        end
-      end
-    end
-
-    describe "User defined functions and formatters in CoffeeScript" do
-      next pending "not supported by Mondrian in Java 8" if ENV_JAVA["java.version"] >= "1.8"
-
-      before(:each) do
-        @schema.define do
-          cube 'Sales' do
-            table 'sales'
-            dimension 'Customers', :foreign_key => 'customer_id' do
-              hierarchy :has_all => true, :all_member_name => 'All Customers', :primary_key => 'id' do
-                table 'customers'
-                level 'Name', :column => 'fullname' do
-                  member_formatter { coffeescript "member.getName().toUpperCase()" }
-                  property 'City', :column => 'city' do
-                    property_formatter { coffeescript "propertyValue.toUpperCase()" }
-                  end
-                end
-              end
-            end
-            calculated_member 'Factorial' do
-              dimension 'Measures'
-              formula 'Factorial(6)'
-              cell_formatter do
-                coffeescript <<-CS
-                  s = value.toString()
-                  s = "0" + s while s.length < 20
-                  s
-                CS
-              end
-            end
-            calculated_member 'City' do
-              dimension 'Measures'
-              formula "[Customers].CurrentMember.Properties('City')"
-            end
-          end
-          user_defined_function 'Factorial' do
-            coffeescript <<-CS
-              parameters: ["Numeric"]
-              returns: "Numeric"
-              execute: (n) ->
-                if n <= 1 then 1 else n * @execute(n - 1)
-            CS
-          end
-          user_defined_function 'UpperName' do
-            coffeescript <<-CS
-              parameters: ["Member"]
-              returns: "String"
-              syntax: "Property"
-              execute: (member) ->
-                member.getName().toUpperCase()
-            CS
-          end
-          user_defined_function 'toUpperName' do
-            coffeescript <<-CS
-              parameters: ["Member", "String"]
-              returns: "String"
-              syntax: "Method"
-              execute: (member, dummy) ->
-                member.getName().toUpperCase()
-            CS
-          end
-        end
-        @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS.merge :schema => @schema)
-      end
-
-      it "should execute user defined function" do
-        result = @olap.from('Sales').columns('[Measures].[Factorial]').execute
-        value = 1*2*3*4*5*6
-        result.values.should == [value]
-        result.formatted_values.should == ["%020d" % value]
-      end
-
-      it "should format members and properties" do
-        result = @olap.from('Sales').columns('[Measures].[City]').rows('[Customers].[All Customers].Children').execute
-        result.row_members.each_with_index do |member, i|
-          member.caption.should == member.name.upcase
-          city = member.property_value('City')
-          result.formatted_values[i].first.should == city
-          member.property_formatted_value('City').should == city.upcase
-        end
-      end
-
-      it "should execute user defined property on member" do
-        result = @olap.from('Sales').
-          with_member('[Measures].[Upper Name]').as('[Customers].CurrentMember.UpperName').
-          columns('[Measures].[Upper Name]').rows('[Customers].Children').execute
-        result.row_members.each_with_index do |member, i|
-          result.values[i].should == [member.name.upcase]
-        end
-      end
-
-      it "should execute user defined method on member" do
-        result = @olap.from('Sales').
-          with_member('[Measures].[Upper Name]').as("[Customers].CurrentMember.toUpperName('dummy')").
-          columns('[Measures].[Upper Name]').rows('[Customers].Children').execute
-        result.row_members.each_with_index do |member, i|
-          result.values[i].should == [member.name.upcase]
-        end
-      end
-    end
-
     describe "User defined functions and formatters in Ruby" do
       before(:each) do
         @schema.define do