mondrian-olap 1.2.0 → 1.3.0

data/lib/mondrian/olap/schema_udf.rb

@@ -9,21 +9,8 @@ module Mondrian
       end
 
       module ScriptElements
-        def javascript(text)
-          script text, :language => 'JavaScript'
-        end
-
         private
 
-        def coffeescript_function(arguments_string, text)
-          # construct function to ensure that last expression is returned
-          coffee_text = "#{arguments_string} ->\n" << text.gsub(/^/, '  ')
-          javascript_text = CoffeeScript.compile(coffee_text, :bare => true)
-          # remove function definition first and last lines
-          javascript_text = javascript_text.strip.lines.to_a[1..-2].join
-          javascript javascript_text
-        end
-
         def ruby(*options, &block)
           udf_class_name = if options.include?(:shared)
             "#{name.capitalize}Udf"
@@ -74,64 +61,13 @@ module Mondrian
 
       class UserDefinedFunction < SchemaElement
         include ScriptElements
+
         attributes :name, # Name with which the user-defined function will be referenced in MDX expressions.
-          # Name of the class which implemenets this user-defined function.
-          # Must implement the mondrian.spi.UserDefinedFunction  interface.
+          # Name of the class which implements this user-defined function.
+          # Must implement the mondrian.spi.UserDefinedFunction interface.
           :class_name
         elements :script
 
-        def coffeescript(text)
-          coffee_text = "__udf__ = {\n" << text << "}\n"
-          javascript_text = CoffeeScript.compile(coffee_text, :bare => true)
-          javascript_text << <<-JS
-
-__udf__.parameters || (__udf__.parameters = []);
-__udf__.returns || (__udf__.returns = "Scalar");
-var __scalarTypes__ = {"Numeric":true,"String":true,"Boolean":true,"DateTime":true,"Decimal":true,"Scalar":true};
-function __getType__(type) {
-  if (__scalarTypes__[type]) {
-    return new mondrian.olap.type[type+"Type"];
-  } else if (type === "Member") {
-    return mondrian.olap.type.MemberType.Unknown;
-  } else {
-    return null;
-  }
-}
-function getParameterTypes() {
-  var parameters = __udf__.parameters || [],
-      types = [];
-  for (var i = 0, len = parameters.length; i < len; i++) {
-    types.push(__getType__(parameters[i]))
-  }
-  return types;
-}
-function getReturnType(parameterTypes) {
-  var returns = __udf__.returns || "Scalar";
-  return __getType__(returns);
-}
-if (__udf__.syntax) {
-  function getSyntax() {
-    return mondrian.olap.Syntax[__udf__.syntax];
-  }
-}
-function execute(evaluator, args) {
-  var parameters = __udf__.parameters || [],
-      values = [],
-      value;
-  for (var i = 0, len = parameters.length; i < len; i++) {
-    if (__scalarTypes__[parameters[i]]) {
-      value = args[i].evaluateScalar(evaluator);
-    } else {
-      value = args[i].evaluate(evaluator);
-    }
-    values.push(value);
-  }
-  return __udf__.execute.apply(__udf__, values);
-}
-JS
-          javascript javascript_text
-        end
-
         class RubyUdfBase
           include Java::mondrian.spi.UserDefinedFunction
           def self.function_name=(name); @function_name = name; end
@@ -225,7 +161,7 @@ JS
           arguments_array_class = java.lang.Class.forName "[Lmondrian.spi.UserDefinedFunction$Argument;", true, class_loader
           add_method_signature("execute", [java.lang.Object, Java::mondrian.olap.Evaluator, arguments_array_class])
 
-          # Override this metho if evaluator is needed
+          # Override this method if evaluator is needed
           def call_with_evaluator(evaluator, *values)
             call(*values)
           end
@@ -294,10 +230,6 @@ JS
           end
         end
 
-        def coffeescript(text)
-          coffeescript_function('(value)', text)
-        end
-
         def ruby(*options, &block)
           ruby_formatter(options, Java::mondrian.spi.CellFormatter, 'formatCell', [java.lang.String, java.lang.Object], &block)
         end
@@ -308,12 +240,9 @@ JS
         attributes :class_name
         elements :script
 
-        def coffeescript(text)
-          coffeescript_function('(member)', text)
-        end
-
         def ruby(*options, &block)
-          ruby_formatter(options, Java::mondrian.spi.MemberFormatter, 'formatMember', [java.lang.String, Java::mondrian.olap.Member], &block)
+          ruby_formatter(options, Java::mondrian.spi.MemberFormatter, 'formatMember',
+            [java.lang.String, Java::mondrian.olap.Member], &block)
         end
       end
 
@@ -322,12 +251,9 @@ JS
         attributes :class_name
         elements :script
 
-        def coffeescript(text)
-          coffeescript_function('(member,propertyName,propertyValue)', text)
-        end
-
         def ruby(*options, &block)
-          ruby_formatter(options, Java::mondrian.spi.PropertyFormatter, 'formatProperty', [java.lang.String, Java::mondrian.olap.Member, java.lang.String, java.lang.Object], &block)
+          ruby_formatter(options, Java::mondrian.spi.PropertyFormatter, 'formatProperty',
+            [java.lang.String, Java::mondrian.olap.Member, java.lang.String, java.lang.Object], &block)
         end
       end
 

data/lib/mondrian/olap.rb

@@ -1,18 +1,22 @@
 require 'java'
 require 'nokogiri'
 
+{
+  # Do not register MondrianOlap4jDriver
+  "mondrian.olap4j.registerDriver" => false,
+  # Do not register log3j2 MBean
+  "log4j2.disable.jmx" => true
+}.each do |key, value|
+  if java.lang.System.getProperty(key).nil?
+    java.lang.System.setProperty(key, value.to_s)
+  end
+end
+
 directory = File.expand_path("../jars", __FILE__)
 Dir["#{directory}/*.jar"].each do |file|
   require file
 end
 
-unless java.lang.System.getProperty("log4j.configuration")
-  file_uri = java.io.File.new("#{directory}/log4j.properties").toURI.to_s
-  java.lang.System.setProperty("log4j.configuration", file_uri)
-end
-# register Mondrian olap4j driver
-Java::mondrian.olap4j.MondrianOlap4jDriver
-
 %w(error connection query result schema schema_udf cube).each do |file|
   require "mondrian/olap/#{file}"
 end

data/spec/connection_spec.rb

@@ -12,7 +12,7 @@ describe "Connection" do
     end
 
     it "should be successful" do
-      @olap.connect.should be_true
+      @olap.connect.should == true
     end
 
   end
@@ -25,7 +25,7 @@ describe "Connection" do
       @olap = Mondrian::OLAP::Connection.new(CONNECTION_PARAMS.merge(
         :catalog_content => @schema_xml
       ))
-      @olap.connect.should be_true
+      @olap.connect.should == true
     end
 
   end
@@ -49,10 +49,11 @@ describe "Connection" do
         when 'mysql' then 'mondrian.spi.impl.MySqlDialect'
         when 'postgresql' then 'mondrian.spi.impl.PostgreSqlDialect'
         when 'oracle' then 'mondrian.spi.impl.OracleDialect'
-        when 'mssql' then 'mondrian.spi.impl.MicrosoftSqlServerDialect'
         when 'sqlserver' then 'mondrian.spi.impl.MicrosoftSqlServerDialect'
         when 'vertica' then 'mondrian.spi.impl.VerticaDialect'
         when 'snowflake' then 'mondrian.spi.impl.SnowflakeDialect'
+        when 'clickhouse' then 'mondrian.spi.impl.ClickHouseDialect'
+        when 'mariadb' then 'mondrian.spi.impl.MariaDBDialect'
         end
     end
 
@@ -89,4 +90,37 @@ describe "Connection" do
 
   end
 
+  describe "jdbc_uri" do
+    before(:all) { @olap_connection = Mondrian::OLAP::Connection }
+
+    describe "SQL Server" do
+      it "should return a valid JDBC URI" do
+        @olap_connection.new(
+          driver: 'sqlserver',
+          host: 'example.com',
+          port: 1234,
+          instance: 'MSSQLSERVER',
+          database: 'example_db'
+        ).jdbc_uri.should == 'jdbc:sqlserver://example.com:1234;databaseName=example_db;instanceName=MSSQLSERVER'
+      end
+
+      it "should return a valid JDBC URI with instance name as property" do
+        @olap_connection.new(
+          driver: 'sqlserver',
+          host: 'example.com',
+          properties: {
+            instanceName: "MSSQLSERVER"
+          }
+        ).jdbc_uri.should == 'jdbc:sqlserver://example.com;instanceName=MSSQLSERVER'
+      end
+
+      it "should return a valid JDBC URI with enabled integratedSecurity" do
+        @olap_connection.new(
+          driver: 'sqlserver',
+          host: 'example.com',
+          integrated_security: 'true'
+        ).jdbc_uri.should == 'jdbc:sqlserver://example.com;integratedSecurity=true'
+      end
+    end
+  end
 end

data/spec/cube_cache_control_spec.rb

@@ -73,7 +73,7 @@ describe "Cube" do
   end
 
   # Do not execute tests on analytical databases with slow individual inserts
-  describe 'cache', unless: %w(vertica snowflake).include?(MONDRIAN_DRIVER) do
+  describe 'cache', unless: %w(vertica snowflake clickhouse mariadb).include?(MONDRIAN_DRIVER) do
     def qt(name)
       @connection.quote_table_name(name.to_s)
     end
@@ -90,7 +90,7 @@ describe "Cube" do
       case MONDRIAN_DRIVER
       when 'mysql', 'jdbc_mysql', 'postgresql', 'oracle'
         @connection.execute 'CREATE TABLE sales_copy AS SELECT * FROM sales'
-      when 'mssql', 'sqlserver'
+      when 'sqlserver'
         # Use raw_connection.execute to avoid detecting this query as a SELECT query
         # for which executeQuery JDBC method will fail
         @connection.raw_connection.execute_update 'SELECT * INTO sales_copy FROM sales'

data/spec/cube_spec.rb

@@ -166,6 +166,31 @@ describe "Cube" do
 
   end
 
+  describe "cube hierarchies" do
+    before(:all) do
+      @cube = @olap.cube('Sales')
+      @hierarchy_names = %w(Measures Gender Customers Time Time.Weekly)
+    end
+
+    it "should get hierarchy names" do
+      @cube.hierarchy_names.should == @hierarchy_names
+    end
+
+    it "should get hierarchy by name" do
+      @cube.hierarchy('Gender').name.should == 'Gender'
+    end
+
+    it "should get hierarchy dimension name" do
+      hierarchy = @cube.hierarchy('Time.Weekly')
+      hierarchy.dimension.name.should == 'Time'
+      hierarchy.dimension_name.should == 'Time'
+    end
+
+    it "should return nil when getting dimension with invalid name" do
+      @cube.hierarchy('invalid').should be_nil
+    end
+  end
+
   describe "dimension hierarchies" do
     before(:all) do
       @cube = @olap.cube('Sales')
@@ -218,6 +243,15 @@ describe "Cube" do
       @cube.dimension('Gender').hierarchy.levels.map(&:members_count).should == [1, 2]
     end
 
+    it "should set and get hierarchy level cardinality" do
+      level = @cube.dimension('Gender').hierarchy.levels.last
+      level.cardinality.should == Java::JavaLang::Integer::MIN_VALUE
+      level.cardinality = 2
+      @olap.cube('Sales').dimension('Gender').hierarchy.levels.last.cardinality.should == 2
+      level.cardinality = nil
+      @olap.cube('Sales').dimension('Gender').hierarchy.levels.last.cardinality.should == Java::JavaLang::Integer::MIN_VALUE
+    end
+
     it "should get hierarchy annotations" do
       @cube.dimension('Customers').hierarchy.annotations.should == {'foo' => 'bar'}
     end
@@ -238,12 +272,12 @@ describe "Cube" do
     end
 
     it "should get hierarchy all member" do
-      @cube.dimension('Gender').hierarchy.has_all?.should be_true
+      @cube.dimension('Gender').hierarchy.has_all?.should == true
       @cube.dimension('Gender').hierarchy.all_member_name.should == 'All Genders'
     end
 
     it "should not get all member for hierarchy without all member" do
-      @cube.dimension('Time').hierarchy.has_all?.should be_false
+      @cube.dimension('Time').hierarchy.has_all?.should == false
       @cube.dimension('Time').hierarchy.all_member_name.should be_nil
     end
 

data/spec/fixtures/MondrianTest.xml

@@ -126,4 +126,44 @@ fullname
   </CalculatedMember>
 </Cube>
 
+<Cube name="Warehouse">
+  <Table name="warehouse"/>
+  <DimensionUsage name="Time" source="Time" foreignKey="time_id"/>
+  <DimensionUsage name="Product" source="Product" foreignKey="product_id"/>
+  <Measure aggregator="sum" column="units_shipped" formatString="#,##0" name="Units Shipped"/>
+  <Measure aggregator="sum" column="store_invoice" formatString="#,##0.00" name="Store Invoice"/>
+  <Measure name="Products with units shipped" aggregator="distinct-count" formatString="#,###">
+    <MeasureExpression>
+      <SQL dialect="generic">
+CASE WHEN units_shipped IS NOT NULL THEN product_id END
+      </SQL>
+    </MeasureExpression>
+  </Measure>
+</Cube>
+
+<VirtualCube name="Sales and Warehouse">
+  <VirtualCubeDimension name="Customers" cubeName="Sales"/>
+  <VirtualCubeDimension name="Gender" cubeName="Sales"/>
+  <VirtualCubeDimension name="Product"/>
+  <VirtualCubeDimension name="Time"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Unit Sales]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Store Cost]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Store Sales]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Sales Count]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Customer Count]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Units Shipped]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Store Invoice]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Products with units shipped]"/>
+</VirtualCube>
+
+<Role name="Canada manager">
+  <SchemaGrant access="none">
+    <CubeGrant access="all" cube="Sales">
+      <HierarchyGrant access="custom" hierarchy="[Customers]">
+        <MemberGrant access="all" member="[Customers].[Canada]"/>
+      </HierarchyGrant>
+    </CubeGrant>
+  </SchemaGrant>
+</Role>
+
 </Schema>

data/spec/fixtures/MondrianTestOracle.xml

@@ -126,4 +126,44 @@ FULLNAME
   </CalculatedMember>
 </Cube>
 
+<Cube name="Warehouse">
+  <Table name="WAREHOUSE"/>
+  <DimensionUsage name="Time" source="Time" foreignKey="TIME_ID"/>
+  <DimensionUsage name="Product" source="Product" foreignKey="PRODUCT_ID"/>
+  <Measure aggregator="sum" column="UNITS_SHIPPED" formatString="#,##0" name="Units Shipped"/>
+  <Measure aggregator="sum" column="STORE_INVOICE" formatString="#,##0.00" name="Store Invoice"/>
+  <Measure name="Products with units shipped" aggregator="distinct-count" formatString="#,###">
+    <MeasureExpression>
+      <SQL dialect="generic">
+CASE WHEN UNITS_SHIPPED IS NOT NULL THEN PRODUCT_ID END
+      </SQL>
+    </MeasureExpression>
+  </Measure>
+</Cube>
+
+<VirtualCube name="Sales and Warehouse">
+  <VirtualCubeDimension name="Customers" cubeName="Sales"/>
+  <VirtualCubeDimension name="Gender" cubeName="Sales"/>
+  <VirtualCubeDimension name="Product"/>
+  <VirtualCubeDimension name="Time"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Unit Sales]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Store Cost]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Store Sales]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Sales Count]"/>
+  <VirtualCubeMeasure cubeName="Sales" name="[Measures].[Customer Count]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Units Shipped]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Store Invoice]"/>
+  <VirtualCubeMeasure cubeName="Warehouse" name="[Measures].[Products with units shipped]"/>
+</VirtualCube>
+
+<Role name="Canada manager">
+  <SchemaGrant access="none">
+    <CubeGrant access="all" cube="Sales">
+      <HierarchyGrant access="custom" hierarchy="[Customers]">
+        <MemberGrant access="all" member="[Customers].[Canada]"/>
+      </HierarchyGrant>
+    </CubeGrant>
+  </SchemaGrant>
+</Role>
+
 </Schema>

data/spec/mondrian_spec.rb

@@ -39,6 +39,7 @@ describe "Mondrian features" do
             level 'City', :column => 'city', :unique_members => false
             level 'Name', :column => 'fullname', :unique_members => true do
               property 'Related name', :column => 'related_fullname', :type => "String"
+              property 'Birthdate', :column => 'birthdate', :type => "String"
             end
           end
           hierarchy 'ID', :has_all => true, :all_member_name => 'All Customers', :primary_key => 'id' do
@@ -54,6 +55,9 @@ describe "Mondrian features" do
             level 'Year', :column => 'the_year', :type => 'Numeric', :unique_members => true, :level_type => 'TimeYears'
             level 'Quarter', :column => 'quarter', :unique_members => false, :level_type => 'TimeQuarters'
             level 'Month', :column => 'month_of_year', :type => 'Numeric', :unique_members => false, :level_type => 'TimeMonths'
+            level 'Day', :column => 'day_of_month', :type => 'Numeric', :unique_members => false, :level_type => 'TimeDays' do
+              property 'Date', :column => 'the_date', :type => "String"
+            end
           end
           hierarchy 'Weekly', :has_all => false, :primary_key => 'id' do
             table 'time'
@@ -64,6 +68,17 @@ describe "Mondrian features" do
         measure 'Unit Sales', :column => 'unit_sales', :aggregator => 'sum'
         measure 'Store Sales', :column => 'store_sales', :aggregator => 'sum'
       end
+
+      user_defined_function 'IsDirty' do
+        ruby do
+          returns :scalar
+          syntax :function
+          def call_with_evaluator(evaluator)
+            evaluator.isDirty
+          end
+        end
+      end
+
     end
     @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS.merge :schema => @schema)
   end
@@ -120,4 +135,121 @@ describe "Mondrian features" do
     expect { @olap.execute mdx }.not_to raise_error
   end
 
+  # Test for https://jira.pentaho.com/browse/MONDRIAN-2714
+  it "should return datetime property as java.sql.Timestamp" do
+    full_name = '[2010].[Q1].[1].[1]'
+    member = @olap.cube('Sales').member(full_name)
+    member.property_value('Date').should be_a(java.sql.Timestamp)
+
+    result = @olap.from('Sales').
+      with_member('[Measures].[date]').as("#{full_name}.Properties('Date')", format_string: 'dd.mm.yyyy').
+      columns('[Measures].[date]').execute
+    result.values.first.should be_a(java.sql.Timestamp)
+    result.formatted_values.first.should == '01.01.2010'
+  end
+
+  it "should return date property as java.sql.Date" do
+    expected_date_class =
+      case MONDRIAN_DRIVER
+      when 'oracle'
+        java.sql.Timestamp
+      else
+        java.sql.Date
+      end
+
+    member = @olap.cube('Sales').hierarchy('Customers').level('Name').members.first
+    date_value = member.property_value('Birthdate')
+    date_value.should be_a(expected_date_class)
+
+    result = @olap.from('Sales').
+      with_member('[Measures].[date]').as("#{member.full_name}.Properties('Birthdate')", format_string: 'dd.mm.yyyy').
+      columns('[Measures].[date]').execute
+    result.values.first.should be_a(expected_date_class)
+    result.formatted_values.first.should == Date.parse(date_value.to_s).strftime("%d.%m.%Y")
+  end
+
+  describe "optimized Aggregate" do
+    def expected_value(crossjoin_members = nil)
+      query = @olap.from('Sales').columns('[Measures].[Unit Sales]')
+      query = query.crossjoin(crossjoin_members) if crossjoin_members
+      query.rows('[Customers].[USA].[CA]', '[Customers].[USA].[OR]').
+        execute.values.map(&:first).inject(&:+)
+    end
+
+    it "should aggregate stored members" do
+      result = @olap.from('Sales').
+        with_member('[Customers].[CA and OR]').as("Aggregate({[Customers].[USA].[CA], [Customers].[USA].[OR]})").
+        columns('[Measures].[Unit Sales]').
+        rows('[Customers].[CA and OR]').execute
+      result.values[0][0].should == expected_value
+    end
+
+    it "should aggregate stored members from several dimensions" do
+      result = @olap.from('Sales').
+        with_member('[Customers].[CA and OR]').
+          as("Aggregate({[Gender].[F]} * {[Customers].[USA].[CA], [Customers].[USA].[OR]})").
+        columns('[Measures].[Unit Sales]').
+        rows('[Customers].[CA and OR]').execute
+      result.values[0][0].should == expected_value('[Gender].[F]')
+    end
+
+    it "should aggregate stored members and a measure" do
+      result = @olap.from('Sales').
+        with_member('[Measures].[CA and OR]').
+          as("Aggregate({[Customers].[USA].[CA], [Customers].[USA].[OR]} * {[Measures].[Unit Sales]})").
+        columns('[Measures].[CA and OR]').execute
+      result.values[0].should == expected_value
+    end
+
+    it "should aggregate stored members with expression" do
+      result = @olap.from('Sales').
+        with_member('[Measures].[CA and OR twice]').
+          as("Aggregate({[Customers].[USA].[CA], [Customers].[USA].[OR]}, [Measures].[Unit Sales] * 2)").
+        columns('[Measures].[CA and OR twice]').execute
+      result.values[0].should == expected_value * 2
+    end
+
+    it "should aggregate calculated aggregate members" do
+      result = @olap.from('Sales').
+        with_member('[Customers].[CA calculated]').as("Aggregate({[Customers].[USA].[CA]})").
+        with_member('[Customers].[OR calculated]').as("Aggregate({[Customers].[USA].[OR]})").
+        with_member('[Customers].[CA and OR]').as("Aggregate({[Customers].[CA calculated], [Customers].[OR calculated]})").
+        columns('[Measures].[Unit Sales]').
+        rows('[Customers].[CA and OR]').execute
+      result.values[0][0].should == expected_value
+    end
+  end
+
+  it "should call evaluator isDirty method" do
+    result = @olap.from('Sales').
+      with_member('[Measures].[is dirty]').as('IsDirty()').
+      columns('[Measures].[is dirty]').execute
+    result.values[0].should == false
+  end
+
+  it "should support multiple values IN expression" do
+    lambda do
+      @olap.from('Sales').
+      columns('[Measures].[Unit Sales]').
+      where('[Time].[2011].[Q1]', '[Time].[2011].[Q2]').
+      execute
+    end.should_not raise_error
+  end
+
+  describe "functions with double argument" do
+    it "should get Abs with decimal measure" do
+      result = @olap.from('Sales').
+        with_member('[Measures].[Abs Store Sales]').as('Abs([Measures].[Store Sales])').
+        columns('[Measures].[Store Sales]', '[Measures].[Abs Store Sales]').execute
+      result.values[0].should == result.values[1]
+    end
+
+    it "should get Round with decimal measure" do
+      result = @olap.from('Sales').
+        with_member('[Measures].[Round Store Sales]').as('Round([Measures].[Store Sales])').
+        columns('[Measures].[Store Sales]', '[Measures].[Round Store Sales]').
+        where('[Customers].[USA].[CA]').execute
+      result.values[0].round.should == result.values[1]
+    end
+  end
 end