mondrian-olap 0.5.0 → 1.2.0

data/spec/cube_spec.rb

@@ -10,17 +10,21 @@ describe "Cube" do
         caption 'Sales caption'
         annotations :foo => 'bar'
         table 'sales'
+        visible true
         dimension 'Gender', :foreign_key => 'customer_id' do
           description 'Gender description'
           caption 'Gender caption'
+          visible true
           hierarchy :has_all => true, :primary_key => 'id' do
             description 'Gender hierarchy description'
             caption 'Gender hierarchy caption'
             all_member_name 'All Genders'
             all_member_caption 'All Genders caption'
             table 'customers'
+            visible true
             level 'Gender', :column => 'gender', :unique_members => true,
                             :description => 'Gender level description', :caption => 'Gender level caption' do
+              visible true
               # Dimension values SQL generated by caption_expression fails on PostgreSQL and MS SQL
               if %w(mysql oracle).include?(MONDRIAN_DRIVER)
                 caption_expression do
@@ -56,6 +60,10 @@ describe "Cube" do
             level 'Week', :column => 'weak_of_year', :type => 'Numeric', :unique_members => false, :level_type => 'TimeWeeks'
           end
         end
+        calculated_member 'Last week' do
+          hierarchy '[Time.Weekly]'
+          formula 'Tail([Time.Weekly].[Week].Members).Item(0)'
+        end
         measure 'Unit Sales', :column => 'unit_sales', :aggregator => 'sum', :annotations => {:foo => 'bar'}
         measure 'Store Sales', :column => 'store_sales', :aggregator => 'sum'
         measure 'Store Cost', :column => 'store_cost', :aggregator => 'sum', :visible => false
@@ -92,6 +100,10 @@ describe "Cube" do
     @olap.cube('Sales').annotations.should == {'foo' => 'bar'}
   end
 
+  it "should be visible" do
+    @olap.cube('Sales').should be_visible
+  end
+
   describe "dimensions" do
     before(:all) do
       @cube = @olap.cube('Sales')
@@ -147,6 +159,11 @@ describe "Cube" do
     it "should get dimension empty annotations" do
       @cube.dimension('Gender').annotations.should == {}
     end
+
+    it "should be visible" do
+      @cube.dimension('Gender').should be_visible
+    end
+
   end
 
   describe "dimension hierarchies" do
@@ -208,6 +225,11 @@ describe "Cube" do
     it "should get hierarchy empty annotations" do
       @cube.dimension('Gender').hierarchy.annotations.should == {}
     end
+
+    it "should be visible" do
+      @cube.dimension('Gender').hierarchies.first.should be_visible
+    end
+
   end
 
   describe "hierarchy values" do
@@ -288,6 +310,10 @@ describe "Cube" do
       @cube.dimension('Gender').hierarchy.level('Gender').annotations.should == {}
     end
 
+    it "should be visible" do
+      @cube.dimension('Gender').hierarchy.level('Gender').should be_visible
+    end
+
   end
 
   describe "members" do
@@ -356,6 +382,10 @@ describe "Cube" do
       @cube.member('[Customers].[Non-USA]').should be_calculated
     end
 
+    it "should be calculated when member is calculated in non-default hierarchy" do
+      @cube.member('[Time.Weekly].[Last week]').should be_calculated
+    end
+
     it "should not be calculated in query when calculated member defined in schema" do
       @cube.member('[Customers].[Non-USA]').should_not be_calculated_in_query
     end
@@ -384,11 +414,11 @@ describe "Cube" do
       @cube.member('[Time].[2011]').dimension_type.should == :time
     end
 
-    it "should be visble when member is visible" do
+    it "should be visible when member is visible" do
       @cube.member('[Measures].[Store Sales]').should be_visible
     end
 
-    it "should not be visble when member is not visible" do
+    it "should not be visible when member is not visible" do
       @cube.member('[Measures].[Store Cost]').should_not be_visible
     end
 
@@ -403,7 +433,5 @@ describe "Cube" do
     it "should get member empty annotations" do
       @cube.member('[Customers].[USA]').annotations.should == {}
     end
-
   end
-
 end

data/spec/fixtures/MondrianTest.xml

@@ -61,9 +61,6 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customers`.`fname`, ' ', `customers`.`lname`)
-          </SQL>
-          <SQL dialect="luciddb">
-"fname" || ' ' || "lname"
           </SQL>
           <SQL dialect="generic">
 fullname
@@ -78,15 +75,13 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customers`.`fname`, ' ', `customers`.`lname`)
-          </SQL>
-          <SQL dialect="luciddb">
-"fname" || ' ' || "lname"
           </SQL>
           <SQL dialect="generic">
 fullname
           </SQL>
         </OrdinalExpression>
         <Property name="Gender" column="gender"/>
+        <Property name="Description" column="description"/>
       </Level>
     </Hierarchy>
   </Dimension>

data/spec/fixtures/MondrianTestOracle.xml

@@ -61,9 +61,6 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
-          </SQL>
-          <SQL dialect="luciddb">
-fname || ' ' || lname
           </SQL>
           <SQL dialect="generic">
 FULLNAME
@@ -78,15 +75,13 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
-          </SQL>
-          <SQL dialect="luciddb">
-fname || ' ' || lname
           </SQL>
           <SQL dialect="generic">
 FULLNAME
           </SQL>
         </OrdinalExpression>
         <Property name="Gender" column="GENDER"/>
+        <Property name="Description" column="DESCRIPTION"/>
       </Level>
     </Hierarchy>
   </Dimension>

data/spec/mondrian_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "spec_helper"
 
 describe "Mondrian features" do
@@ -11,13 +13,39 @@ describe "Mondrian features" do
             level 'Gender', :column => 'gender', :unique_members => true
           end
         end
+        dimension 'Promotions', :foreign_key => 'promotion_id' do
+          hierarchy :has_all => true, :primary_key => 'id' do
+            table 'promotions'
+            level 'Promotion', :column => 'id', :name_column => 'promotion', :unique_members => true, :ordinal_column => 'sequence', :type => 'Numeric'
+          end
+        end
+        dimension 'Linked Promotions', :foreign_key => 'customer_id' do
+          hierarchy :has_all => true, :primary_key => 'id', :primary_key_table => 'customers' do
+            join :left_key => 'related_fullname', :right_key => 'fullname' do
+              table "customers"
+              join :left_key => "promotion_id", :right_key => "id" do
+                table "customers", :alias => "customers_bt"
+                table "promotions"
+              end
+            end
+            level 'Promotion', :column => 'id', :name_column => 'promotion', :unique_members => true, :table => 'promotions', :ordinal_column => 'sequence', :type => 'Numeric', :approx_row_count => 10
+          end
+        end
         dimension 'Customers', :foreign_key => 'customer_id' do
           hierarchy :has_all => true, :all_member_name => 'All Customers', :primary_key => 'id' do
             table 'customers'
             level 'Country', :column => 'country', :unique_members => true
             level 'State Province', :column => 'state_province', :unique_members => true
             level 'City', :column => 'city', :unique_members => false
-            level 'Name', :column => 'fullname', :unique_members => true
+            level 'Name', :column => 'fullname', :unique_members => true do
+              property 'Related name', :column => 'related_fullname', :type => "String"
+            end
+          end
+          hierarchy 'ID', :has_all => true, :all_member_name => 'All Customers', :primary_key => 'id' do
+            table 'customers'
+            level 'ID', :column => 'id', :type => 'Numeric', :internal_type => 'long', :unique_members => true do
+              property 'Name', :column => 'fullname'
+            end
           end
         end
         dimension 'Time', :foreign_key => 'time_id', :type => 'TimeDimension' do
@@ -50,4 +78,46 @@ describe "Mondrian features" do
     end.should_not raise_error
   end
 
+  # test for https://jira.pentaho.com/browse/MONDRIAN-2683
+  it "should order crossjoin of rows" do
+    lambda do
+      @olap.from('Sales').
+      columns('[Measures].[Unit Sales]').
+      rows('[Customers].[Country].Members').crossjoin('[Gender].[Gender].Members').
+        order('[Measures].[Unit Sales]', :bdesc).
+      execute
+    end.should_not raise_error
+  end
+
+  it "should generate correct member name from large number key" do
+    result = @olap.from('Sales').
+      columns("Filter([Customers.ID].[ID].Members, [Customers.ID].CurrentMember.Properties('Name') = 'Big Number')").
+      execute
+    result.column_names.should == ["10000000000"]
+  end
+
+  # test for https://jira.pentaho.com/browse/MONDRIAN-990
+  it "should return result when diacritical marks used" do
+    full_name = '[Customers].[USA].[CA].[Rīga]'
+    result = @olap.from('Sales').columns(full_name).execute
+    result.column_full_names.should == [full_name]
+  end
+
+  it "should execute MDX with join tables" do
+    # Load dimension members in Mondrian cache as the problem occurred when searching members in the cache
+    @olap.from('Sales').columns('CROSSJOIN({[Linked Promotions].[Promotion].[Promotion 2]}, [Customers].[Name].Members)').execute
+
+    mdx = <<~MDX
+      SELECT
+        NON EMPTY FILTER(
+          CROSSJOIN({[Linked Promotions].[Promotion].[Promotion 2]}, [Customers].[Name].Members),
+          (([Measures].[Unit Sales]) <> 0)
+        ) ON ROWS,
+        [Measures].[Unit Sales] ON COLUMNS
+      FROM [Sales]
+    MDX
+
+    expect { @olap.execute mdx }.not_to raise_error
+  end
+
 end

data/spec/query_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe "Query" do
-  def quote_table_name(name)
-    ActiveRecord::Base.connection.quote_table_name(name)
+  def qt(name)
+    ActiveRecord::Base.connection.quote_table_name(name.to_s)
   end
 
   before(:all) do
@@ -21,9 +21,9 @@ describe "Query" do
     FROM sales
       LEFT JOIN products ON sales.product_id = products.id
       LEFT JOIN product_classes ON products.product_class_id = product_classes.id
-      LEFT JOIN #{quote_table_name('time')} ON sales.time_id = #{quote_table_name('time')}.id
+      LEFT JOIN #{qt :time} ON sales.time_id = #{qt :time}.id
       LEFT JOIN customers ON sales.customer_id = customers.id
-    WHERE #{quote_table_name('time')}.the_year = 2010 AND #{quote_table_name('time')}.quarter = 'Q1'
+    WHERE #{qt :time}.the_year = 2010 AND #{qt :time}.quarter = 'Q1'
       AND customers.country = 'USA' AND customers.state_province = 'CA'
     GROUP BY product_classes.product_family
     ORDER BY product_classes.product_family
@@ -179,6 +179,13 @@ describe "Query" do
       end
     end
 
+    describe "distinct" do
+      it "should limit to set of distinct tuples" do
+        @query.rows('[Product].children').distinct.nonempty.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]')
+        @query.rows.should == [:nonempty, [:distinct, ["[Product].children"]]]
+      end
+    end
+
     describe "order" do
       it "should order by one measure" do
         @query.rows('[Product].children').order('[Measures].[Unit Sales]', :bdesc)
@@ -282,6 +289,18 @@ describe "Query" do
       end
     end
 
+    describe "generate" do
+      it "should generate new set" do
+        @query.rows('[Customers].[Country].Members').generate('[Customers].CurrentMember')
+        @query.rows.should == [:generate, ['[Customers].[Country].Members'], ['[Customers].CurrentMember']]
+      end
+
+      it "should generate new set with all option" do
+        @query.rows('[Customers].[Country].Members').generate('[Customers].CurrentMember', :all)
+        @query.rows.should == [:generate, ['[Customers].[Country].Members'], ['[Customers].CurrentMember'], 'ALL']
+      end
+    end
+
     describe "where" do
       it "should accept conditions" do
         @query.where('[Time].[2010].[Q1]', '[Customers].[USA].[CA]').should equal(@query)
@@ -605,6 +624,26 @@ describe "Query" do
           SQL
       end
 
+      it "should return query with generate" do
+        @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
+          rows('[Customers].[Country].Members').generate('[Customers].CurrentMember').
+          to_mdx.should be_like <<-SQL
+            SELECT  {[Measures].[Unit Sales], [Measures].[Store Sales]} ON COLUMNS,
+                    GENERATE([Customers].[Country].Members, [Customers].CurrentMember) ON ROWS
+              FROM  [Sales]
+          SQL
+      end
+
+      it "should return query with generate all" do
+        @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
+          rows('[Customers].[Country].Members').generate('[Customers].CurrentMember', :all).
+          to_mdx.should be_like <<-SQL
+            SELECT  {[Measures].[Unit Sales], [Measures].[Store Sales]} ON COLUMNS,
+                    GENERATE([Customers].[Country].Members, [Customers].CurrentMember, ALL) ON ROWS
+              FROM  [Sales]
+          SQL
+      end
+
       it "should return query including WITH MEMBER clause" do
         @query.
           with_member('[Measures].[ProfitPct]').
@@ -632,20 +671,25 @@ describe "Query" do
       end
 
       it "should return query including WITH SET clause" do
-        @query.with_set('SelectedRows').
+        @query.with_set('CrossJoinSet').
             as('[Product].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]').
+          with_set('MemberSet').as('[Product].[All Products]').
+          with_set('FunctionSet').as('[Product].AllMembers').
+          with_set('ItemSet').as('[Product].AllMembers.Item(0)').
           with_member('[Measures].[Profit]').
             as('[Measures].[Store Sales] - [Measures].[Store Cost]').
           columns('[Measures].[Profit]').
-          rows('SelectedRows').
+          rows('CrossJoinSet').
           to_mdx.should be_like <<-SQL
             WITH
-               SET SelectedRows AS
-               'CROSSJOIN([Product].children, {[Customers].[Canada], [Customers].[USA]})'
+               SET CrossJoinSet AS 'CROSSJOIN([Product].children, {[Customers].[Canada], [Customers].[USA]})'
+               SET MemberSet AS '{[Product].[All Products]}'
+               SET FunctionSet AS '[Product].AllMembers'
+               SET ItemSet AS '{[Product].AllMembers.Item(0)}'
                MEMBER [Measures].[Profit] AS
                '[Measures].[Store Sales] - [Measures].[Store Cost]'
             SELECT  {[Measures].[Profit]} ON COLUMNS,
-                    SelectedRows ON ROWS
+                    CrossJoinSet ON ROWS
               FROM  [Sales]
           SQL
       end
@@ -717,6 +761,17 @@ describe "Query" do
       }
     end
 
+    it "should raise error when TokenMgrError is raised" do
+      expect {
+        @query.with_member('[Measures].[Dummy]').as('[Measures].[Store Sales]]').
+          columns('[Measures].[Dummy]').execute
+      }.to raise_error {|e|
+        e.should be_kind_of(Mondrian::OLAP::Error)
+        e.message.should =~ /mondrian\.parser\.TokenMgrError/
+        e.root_cause_message.should =~ /Lexical error/
+      }
+    end
+
   end
 
   describe "drill through cell" do
@@ -733,7 +788,7 @@ describe "Query" do
       @drill_through.column_types.should == [
         :INT, :VARCHAR, :INT, :INT, :INT,
         :VARCHAR, :VARCHAR, :VARCHAR, :VARCHAR, :VARCHAR, :VARCHAR,
-        :VARCHAR, :VARCHAR, :VARCHAR, :INT,
+        :VARCHAR, :VARCHAR, :VARCHAR, :BIGINT,
         :VARCHAR,
         :DECIMAL
       ]
@@ -752,12 +807,14 @@ describe "Query" do
     end if %w(mysql postgresql).include? MONDRIAN_DRIVER
 
     it "should return table names" do
-      @drill_through.table_names.should == [
+      # ignore calculated customer full name column name which is shown differently on each database
+      @drill_through.table_names[0..12].should == [
         "time", "time", "time", "time", "time",
         "product_classes", "product_classes", "product_classes", "product_classes", "products", "products",
-        "customers", "customers", "", "customers",
-        "customers",
-        "sales"
+        "customers", "customers"
+      ]
+      @drill_through.table_names[14..16].should == [
+        "customers", "customers", "sales"
       ]
     end if %w(mysql postgresql).include? MONDRIAN_DRIVER
 
@@ -776,8 +833,7 @@ describe "Query" do
     end
 
     it "should return correct row value types" do
-      @drill_through.rows.first.map(&:class).should ==
-        case MONDRIAN_DRIVER
+      expected_value_types = case MONDRIAN_DRIVER
         when "oracle"
           [
             BigDecimal, String, BigDecimal, BigDecimal, BigDecimal,
@@ -788,21 +844,26 @@ describe "Query" do
           ]
         when 'mssql'
           [
-            Fixnum, String, Fixnum, Fixnum, Fixnum,
+            Integer, String, Integer, Integer, Integer,
             String, String, String, String, String, String,
-            String, String, String, BigDecimal,
+            # last one can be BigDecimal or Integer, probably depends on MS SQL version
+            String, String, String, Numeric,
             String,
             BigDecimal
           ]
         else
           [
-            Fixnum, String, Fixnum, Fixnum, Fixnum,
+            Integer, String, Integer, Integer, Integer,
             String, String, String, String, String, String,
-            String, String, String, Fixnum,
+            String, String, String, Integer,
             String,
             BigDecimal
           ]
         end
+
+      @drill_through.rows.first.each_with_index do |value, i|
+        value.should be_a expected_value_types[i]
+      end
     end
 
     it "should return only specified max rows" do
@@ -816,8 +877,7 @@ describe "Query" do
       @query = @olap.from('Sales')
       @result = @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
         rows('[Product].children').
-        # where('[Time].[2010].[Q1]', '[Customers].[USA].[CA]').
-        where('[Time].[2010].[Q1]').
+        where('[Time].[2010].[Q1]', '[Time].[2010].[Q2]').
         execute
     end
 
@@ -829,9 +889,9 @@ describe "Query" do
         '[Measures].[Unit Sales]', '[Measures].[Store Sales]'
       ])
       @drill_through.column_labels.should == [
-        "Month",
-        "City",
-        "Product Family",
+        "Month (Key)",
+        "City (Key)",
+        "Product Family (Key)",
         "Unit Sales", "Store Sales"
       ]
     end
@@ -847,6 +907,78 @@ describe "Query" do
       @drill_through.rows.all?{|r| r.any?{|c| c}}.should be_true
     end
 
+    it "should return member name and property values" do
+      @drill_through = @result.drill_through(row: 0, column: 0,
+        return: [
+          "Name([Customers].[Name])",
+          "Property([Customers].[Name], 'Gender')",
+          "Property([Customers].[Name], 'Description')",
+          "Property([Customers].[Name], 'Very long non-existing property name')"
+        ]
+      )
+      @drill_through.column_labels.should == [
+        "Name", "Gender", "Description",
+        "Very long non-existing property name"[0, MONDRIAN_DRIVER == 'oracle' ? 30 : 9999]
+      ]
+      @drill_through.rows.should == @sql.select_rows(<<-SQL)
+        SELECT
+          customers.fullname,
+          customers.gender,
+          customers.description,
+          '' as non_existing
+        FROM
+          sales,
+          customers,
+          time,
+          products,
+          product_classes
+        WHERE
+          (time.quarter = 'Q1' OR time.quarter = 'Q2') AND
+          time.the_year = 2010 AND
+          product_classes.product_family = 'Drink' AND
+          products.product_class_id = product_classes.id AND
+          sales.product_id = products.id AND
+          sales.time_id = time.id AND
+          customers.id = sales.customer_id
+        ORDER BY
+          customers.fullname,
+          customers.gender,
+          customers.description
+      SQL
+    end
+
+    it "should group by" do
+      @drill_through = @result.drill_through(row: 0, column: 0,
+        return: [
+          "[Product].[Product Family]",
+          "[Measures].[Unit Sales]",
+          "[Measures].[Store Cost]"
+        ],
+        group_by: true
+      )
+      @drill_through.column_labels.should == [ "Product Family (Key)", "Unit Sales", "Store Cost" ]
+      @drill_through.rows.should == @sql.select_rows(<<-SQL
+        SELECT
+          product_classes.product_family,
+          SUM(sales.unit_sales) AS unit_sales,
+          SUM(sales.store_cost) AS store_cost
+        FROM
+          sales,
+          time,
+          products,
+          product_classes
+        WHERE
+          (time.quarter = 'Q1' OR time.quarter = 'Q2') AND
+          time.the_year = 2010 AND
+          product_classes.product_family = 'Drink' AND
+          products.product_class_id = product_classes.id AND
+          sales.product_id = products.id AND
+          sales.time_id = time.id
+        GROUP BY
+          product_classes.product_family
+      SQL
+      )
+    end
   end
 
   describe "drill through statement" do
@@ -895,4 +1027,170 @@ describe "Query" do
 
   end
 
+  describe "schema cache" do
+    before(:all) do
+      product_id = @sql.select_value("SELECT MIN(id) FROM products")
+      time_id = @sql.select_value("SELECT MIN(id) FROM #{qt :time}")
+      customer_id = @sql.select_value("SELECT MIN(id) FROM customers")
+      @condition = "product_id = #{product_id} AND time_id = #{time_id} AND customer_id = #{customer_id}"
+      # check expected initial value
+      @first_unit_sales = 1
+      @sql.select_value("SELECT unit_sales FROM sales WHERE #{@condition}").to_i.should == @first_unit_sales
+    end
+
+    before do
+      create_olap_connection
+      @unit_sales = query_unit_sales_value
+
+      update_first_unit_sales(@first_unit_sales + 1)
+
+      # should still use previous value from cache
+      create_olap_connection
+      query_unit_sales_value.should == @unit_sales
+    end
+
+    after do
+      update_first_unit_sales(@first_unit_sales)
+      Mondrian::OLAP::Connection.flush_schema_cache
+    end
+
+    def create_olap_connection(options = {})
+      @olap2.close if @olap2
+      @olap2 = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS_WITH_CATALOG.merge(options))
+    end
+
+    def update_first_unit_sales(value)
+      @sql.update "UPDATE sales SET unit_sales = #{value} WHERE #{@condition}"
+    end
+
+    def query_unit_sales_value
+      @olap2.from('Sales').columns('[Measures].[Unit Sales]').execute.values.first
+    end
+
+    it "should flush schema cache" do
+      @olap2.flush_schema
+      create_olap_connection
+      query_unit_sales_value.should == @unit_sales + 1
+    end
+
+    it "should remove schema by key" do
+      Mondrian::OLAP::Connection.flush_schema(@olap2.schema_key)
+      create_olap_connection
+      query_unit_sales_value.should == @unit_sales + 1
+    end
+
+  end
+
+  describe "profiling" do
+    before(:all) do
+      if @olap
+        @olap.flush_schema
+        @olap.close
+      end
+      @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS_WITH_CATALOG)
+      @result = @olap.execute "SELECT [Measures].[Unit Sales] ON COLUMNS, [Product].Children ON ROWS FROM [Sales]", profiling: true
+      @result.profiling_mark_full("MDX query time", 100)
+    end
+
+    it "should return query plan" do
+      @result.profiling_plan.strip.should == <<-EOS.strip
+Axis (COLUMNS):
+SetListCalc(name=SetListCalc, class=class mondrian.olap.fun.SetFunDef$SetListCalc, type=SetType<MemberType<member=[Measures].[Unit Sales]>>, resultStyle=MUTABLE_LIST)
+    2(name=2, class=class mondrian.olap.fun.SetFunDef$SetListCalc$2, type=MemberType<member=[Measures].[Unit Sales]>, resultStyle=VALUE)
+        Literal(name=Literal, class=class mondrian.calc.impl.ConstantCalc, type=MemberType<member=[Measures].[Unit Sales]>, resultStyle=VALUE_NOT_NULL, value=[Measures].[Unit Sales])
+
+Axis (ROWS):
+Children(name=Children, class=class mondrian.olap.fun.BuiltinFunTable$22$1, type=SetType<MemberType<hierarchy=[Product]>>, resultStyle=LIST)
+    CurrentMemberFixed(hierarchy=[Product], name=CurrentMemberFixed, class=class mondrian.olap.fun.HierarchyCurrentMemberFunDef$FixedCalcImpl, type=MemberType<hierarchy=[Product]>, resultStyle=VALUE)
+      EOS
+    end
+
+    it "should return SQL timing string" do
+      @result.profiling_timing_string.strip.should =~
+        %r{^SqlStatement-Segment.load invoked 1 times for total of \d+ms.  \(Avg. \d+ms/invocation\)$}
+    end
+
+    it "should return custom profiling string" do
+      @result.profiling_timing_string.strip.should =~
+        %r{^MDX query time invoked 1 times for total of 100ms.  \(Avg. 100ms/invocation\)$}
+    end
+
+    it "should return total duration" do
+      @result.total_duration.should > 0
+    end
+  end
+
+  describe "error with profiling" do
+    before(:all) do
+      @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS_WITH_CATALOG)
+      begin
+        @olap.execute <<-MDX, profiling: true
+          SELECT [Measures].[Unit Sales] ON COLUMNS,
+          FILTER([Customers].Children, ([Customers].DefaultMember, [Measures].[Unit Sales]) > 'dummy') ON ROWS
+          FROM [Sales]
+        MDX
+      rescue => e
+        @error = e
+      end
+    end
+
+    it "should return query plan" do
+      @error.profiling_plan.should =~ /^Axis \(COLUMNS\):/
+    end
+
+    it "should return timing string" do
+      @error.profiling_timing_string.should =~
+        %r{^FilterFunDef invoked 1 times for total of \d+ms.  \(Avg. \d+ms/invocation\)$}
+    end
+  end
+
+  describe "timeout" do
+    before(:all) do
+      @schema = Mondrian::OLAP::Schema.new
+      @schema.define do
+        cube 'Sales' do
+          table 'sales'
+          dimension 'Customers', foreign_key: 'customer_id' do
+            hierarchy all_member_name: 'All Customers', primary_key: 'id' do
+              table 'customers'
+              level 'Name', column: 'fullname'
+            end
+          end
+          calculated_member 'Sleep 5' do
+            dimension 'Measures'
+            formula 'Sleep(5)'
+          end
+          calculated_member 'Sleep 0' do
+            dimension 'Measures'
+            formula 'Sleep(0)'
+          end
+        end
+        user_defined_function 'Sleep' do
+          ruby do
+            parameters :numeric
+            returns :numeric
+            def call(n)
+              sleep n
+              n
+            end
+          end
+        end
+      end
+      @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS.merge schema: @schema)
+    end
+
+    it "should raise timeout error for long queries" do
+      expect do
+        @olap.from('Sales').columns('[Measures].[Sleep 5]').execute(timeout: 0.1)
+      end.to raise_error do |e|
+        e.should be_kind_of(Mondrian::OLAP::Error)
+        e.message.should == 'org.olap4j.OlapException: Mondrian Error:Query timeout of 0 seconds reached'
+      end
+    end
+
+    it "should not raise timeout error for short queries" do
+      @olap.from('Sales').columns('[Measures].[Sleep 0]').execute(timeout: 1).values.should == [0]
+    end
+  end
+
 end