mondrian-olap 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df66cbf2bfa1f2a0a746568e7491398870121101d15b23d486e270877de3900
-  data.tar.gz: bfd14249c31c8f4b050c186cf5b355aaa6d91a8a042b89555d862868cfa52ee8
+  metadata.gz: f016aae4b1d6d9f4138ae3bded251944cf7fcfe8f1bd0579df7f962eb1a52d03
+  data.tar.gz: 8b5a4d5c4526f2fd7a239c3dccd57c7d08f5f1d842354fae5bd13f21920e7e73
 SHA512:
-  metadata.gz: 62219364cd64926f57429c4e6ff3373bc5fc19eaadd638544875407357ed11c5442716a6f5245078980762f31c170813bc8ed86e0c7dee6a54c1063c97827b03
-  data.tar.gz: c48f2a34b98c53955af10ccf093bcb73797e6f122282d70ffdf4a0cfeecded72a413bdf782ad68a58c9b44733bd9d4129bf865551fab894b98e1dcafeec717d8
+  metadata.gz: 7a9b3633a62cef270a163c25c5f1511442938b6705b2385fb2b7e2c2a8f9a1a2041b3f041af0be995970fa86307c4fe1af3c0fb94488c86cc1ec617b93acfe3b
+  data.tar.gz: 82ee663a5017af81ed6089f6f162e6d8a98458c1a7afb50e5bf5c3b27ea7422b91e81cc38e099a0a23d7ae99368b8c425083c55b6a6d1f1b75a04566cc664b0a

data/Changelog.md

@@ -1,3 +1,36 @@
+### 1.3.0 / 2023-06-02
+
+* New features
+  * Upgrade to the latest Mondrian version 9.3.0.0 with additional patches
+  * Additional Mondrian patches and improvements
+    * Support for ClickHouse database
+    * Support for MariaDB ColumnStore engine
+    * Improve Aggregate performance of large compound slicers when mondrian.rolap.EnableInMemoryRollup=false
+    * Improve performance of Mondrian member property value lookup
+    * Set dynamic Mondrian connection pool size based on mondrian.rolap.maxSqlThreads property
+    * Skip registration of MondrianOlap4jDriver if mondrian.olap4j.registerDriver=false
+    * Enable Mondrian supportsMultiValueInExpr for PostgreSQL and Oracle
+  * Upgrade to log4j2
+  * Support instance parameter for SQL Server connection
+  * Allow to specify high_cardinality for dimension
+  * Remove deprecated jTDS driver support, use MS JDBC driver instead
+  * Remove user defined functions and formatters in JavaScript and CoffeeScript as they are not supported since JVM 8
+  * Upgrade tests to use the later ActiveRecord and RSpec versions
+  * Tested with JRuby 9.4 and JVM 17
+* Bug fixes
+  * Patch for MONDRIAN-2714 (fixed support for MySQL JDBC driver version 8.0.23)
+
+### 1.2.0 / 2021-03-06
+
+* New features
+  * Upgrade to the latest Mondrian version 9.1.0.0
+  * Improved Vertica and Snowflake tests to use bulk data loading
+  * Remove support of LucidDB (which is abandoned a long time ago)
+  * Improve bigint key columns support
+  * Add MySQL 8 JDBC driver support
+  * Tested with JRuby 9.2.14.0
+  * Remove JRuby 1.7 support
+
 ### 1.1.0 / 2019-11-09
 
 * New features

data/LICENSE-Mondrian.txt

@@ -0,0 +1,87 @@
+Eclipse Public License -v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2010-2019 Raimonds Simanovskis
+Copyright (c) 2010-2021 Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -215,8 +215,8 @@ See more examples of dimension and member queries in `spec/cube_spec.rb`.
 
 ### User defined MDX functions
 
-You can define new MDX functions using JavaScript, CoffeeScript or Ruby language that you can later use
-either in calculated member formulas or in MDX queries. Here are examples of user defined functions in Ruby:
+You can define new MDX functions using Ruby that you can later use either in calculated member formulas or in MDX queries.
+Here are examples of user defined functions in Ruby:
 
 ```ruby
 schema = Mondrian::OLAP::Schema.define do
@@ -273,9 +273,9 @@ See more examples of data access roles in `spec/connection_role_spec.rb`.
 REQUIREMENTS
 ------------
 
-mondrian-olap gem is compatible with JRuby versions 1.7 and 9.x, and Java 8 and 11 VM. mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
+mondrian-olap gem is compatible with JRuby versions 9.3.x and 9.4.x, JVM 8, 11, and 17. mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
 
-mondrian-olap supports MySQL, PostgreSQL, Oracle, LucidDB and Microsoft SQL Server databases as well as other databases that are supported by Mondrian OLAP engine (using jdbc_driver and jdbc_url connection parameters). When using MySQL, PostgreSQL or LucidDB databases then install jdbc-mysql, jdbc-postgres or jdbc-luciddb gem and require "jdbc/mysql", "jdbc/postgres" or "jdbc/luciddb" to load the corresponding JDBC database driver. When using Oracle then include Oracle JDBC driver (`ojdbc8.jar` for Java 8) in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually. When using SQL Server you can choose between the jTDS or Microsoft JDBC drivers. If you use jTDS require "jdbc/jtds". If you use the Microsoft JDBC driver then include the latest `mssql-jdbc-*.jar` in `CLASSPATH` or copy to `JRUBY_HOME/lib` or require it in application manually.
+mondrian-olap supports MySQL, PostgreSQL, Oracle, Microsoft SQL Server, Vertica, Snowflake, and ClickHouse databases as well as other databases that are supported by Mondrian OLAP engine (using jdbc_driver and jdbc_url connection parameters). When using MySQL or PostgreSQL databases then install jdbc-mysql or jdbc-postgres gem and require "jdbc/mysql" or "jdbc/postgres" to load the corresponding JDBC database driver. When using Oracle then require Oracle JDBC driver `ojdbc*.jar`. When using MS SQL Server you then use the Microsoft JDBC driver `mssql-jdbc-*.jar`. When using Vertica, Snowflake, or ClickHouse then require corresponding JDBC drivers.
 
 INSTALL
 -------

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.3.0

data/lib/mondrian/olap/connection.rb

@@ -289,102 +289,148 @@ module Mondrian
         true
       end
 
+      def jdbc_uri
+        if respond_to?(method_name = "jdbc_uri_#{@driver}", true)
+          send method_name
+        else
+          raise ArgumentError, 'unknown JDBC driver'
+        end
+      end
+
       private
 
       def connection_string
         string = "jdbc:mondrian:Jdbc=#{quote_string(jdbc_uri)};JdbcDrivers=#{jdbc_driver};"
         # by default use content checksum to reload schema when catalog has changed
-        string << "UseContentChecksum=true;" unless @params[:use_content_checksum] == false
-        string << "PinSchemaTimeout=#{@params[:pin_schema_timeout]};" if @params[:pin_schema_timeout]
+        string += "UseContentChecksum=true;" unless @params[:use_content_checksum] == false
+        string += "PinSchemaTimeout=#{@params[:pin_schema_timeout]};" if @params[:pin_schema_timeout]
         if role = @params[:role] || @params[:roles]
           roles = Array(role).map{|r| r && r.to_s.gsub(',', ',,')}.compact
-          string << "Role=#{quote_string(roles.join(','))};" unless roles.empty?
+          string += "Role=#{quote_string(roles.join(','))};" unless roles.empty?
         end
         if locale = @params[:locale]
-          string << "Locale=#{quote_string(locale.to_s)};"
+          string += "Locale=#{quote_string(locale.to_s)};"
         end
-        string << (@params[:catalog] ? "Catalog=#{catalog_uri}" : "CatalogContent=#{quote_string(catalog_content)}")
+        string + (@params[:catalog] ? "Catalog=#{catalog_uri}" : "CatalogContent=#{quote_string(catalog_content)}")
       end
 
-      def jdbc_uri
-        case @driver
-        when 'mysql', 'postgresql', 'vertica'
-          uri = "jdbc:#{@driver}://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}/#{@params[:database]}"
-          uri << "?useUnicode=yes&characterEncoding=UTF-8" if @driver == 'mysql'
-          if (properties = @params[:properties]).is_a?(Hash) && !properties.empty?
-            uri << (@driver == 'mysql' ? '&' : '?')
-            uri << properties.map{|k, v| "#{k}=#{v}"}.join('&')
-          end
-          uri
-        when 'oracle'
-          # connection using TNS alias
-          if @params[:database] && !@params[:host] && !@params[:url] && ENV['TNS_ADMIN']
-            "jdbc:oracle:thin:@#{@params[:database]}"
-          else
-            @params[:url] || begin
-              database = @params[:database]
-              unless database =~ %r{^(:|/)}
-                # assume database is a SID if no colon or slash are supplied (backward-compatibility)
-                database = ":#{database}"
-              end
-              "jdbc:oracle:thin:@#{@params[:host] || 'localhost'}:#{@params[:port] || 1521}#{database}"
+      def jdbc_uri_generic(options = {})
+        uri_prefix = options[:uri_prefix] || "jdbc:#{@driver}://"
+        port = @params[:port] || options[:default_port]
+        uri = "#{uri_prefix}#{@params[:host]}#{port && ":#{port}"}"
+        uri += "/#{@params[:database]}" if @params[:database] && options[:add_database] != false
+        properties = new_empty_properties
+        properties.merge!(options[:default_properties]) if options[:default_properties].is_a?(Hash)
+        properties.merge!(@params[:properties]) if @params[:properties].is_a?(Hash)
+        "#{uri}#{uri_properties_string(properties, options[:separator], options[:first_separator])}"
+      end
+
+      def new_empty_properties
+        # If ActiveSupport::HashWithIndifferentAccess is present then treat symbol and string keys as equal
+        defined?(ActiveSupport::HashWithIndifferentAccess) ? ActiveSupport::HashWithIndifferentAccess.new : {}
+      end
+
+      def uri_properties_string(properties, separator = nil, first_separator = nil)
+        properties_string = properties.map { |k, v| "#{k}=#{v}" }.join(separator || '&')
+        unless properties_string.empty?
+          first_separator ||= '?'
+          "#{first_separator}#{properties_string}"
+        end
+      end
+
+      def jdbc_uri_mysql
+        jdbc_uri_generic(default_properties: {useUnicode: true, characterEncoding: 'UTF-8'})
+      end
+
+      alias_method :jdbc_uri_postgresql, :jdbc_uri_generic
+      alias_method :jdbc_uri_vertica, :jdbc_uri_generic
+      alias_method :jdbc_uri_mariadb, :jdbc_uri_generic
+
+      def jdbc_uri_oracle
+        # connection using TNS alias
+        if @params[:database] && !@params[:host] && !@params[:url] && ENV['TNS_ADMIN']
+          "jdbc:oracle:thin:@#{@params[:database]}"
+        else
+          @params[:url] || begin
+            database = @params[:database]
+            unless database =~ %r{^(:|/)}
+              # assume database is a SID if no colon or slash are supplied (backward-compatibility)
+              database = ":#{database}"
             end
+            "jdbc:oracle:thin:@#{@params[:host] || 'localhost'}:#{@params[:port] || 1521}#{database}"
           end
-        when 'luciddb'
-          uri = "jdbc:luciddb:http://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}"
-          uri << ";schema=#{@params[:database_schema]}" if @params[:database_schema]
-          uri
-        when 'mssql'
-          uri = "jdbc:jtds:sqlserver://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}/#{@params[:database]}"
-          uri << ";instance=#{@params[:instance]}" if @params[:instance]
-          uri << ";domain=#{@params[:domain]}" if @params[:domain]
-          uri << ";appname=#{@params[:appname]}" if @params[:appname]
-          uri
-        when 'sqlserver'
-          uri = "jdbc:sqlserver://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}"
-          uri << ";databaseName=#{@params[:database]}" if @params[:database]
-          uri << ";integratedSecurity=#{@params[:integrated_security]}" if @params[:integrated_security]
-          uri << ";applicationName=#{@params[:application_name]}" if @params[:application_name]
-          uri << ";instanceName=#{@params[:instance_name]}" if @params[:instance_name]
-          uri
-        when 'snowflake'
-          uri = "jdbc:snowflake://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}/?db=#{@params[:database]}"
-          uri << "&schema=#{@params[:database_schema]}" if @params[:database_schema]
-          uri << "&warehouse=#{@params[:warehouse]}" if @params[:warehouse]
-          if (properties = @params[:properties]).is_a?(Hash) && !properties.empty?
-            uri << '&'
-            uri << properties.map{|k, v| "#{k}=#{v}"}.join('&')
+        end
+      end
+
+      JDBC_SQLSERVER_PARAM_PROPERTIES = {
+        database: 'databaseName',
+        integrated_security: 'integratedSecurity',
+        application_name: 'applicationName',
+        instance_name: 'instanceName',
+        instance: 'instanceName'
+      }
+
+      def jdbc_uri_sqlserver
+        jdbc_uri_generic(
+          uri_prefix: 'jdbc:sqlserver://', add_database: false, separator: ';', first_separator: ';',
+          default_properties: uri_default_param_properties(JDBC_SQLSERVER_PARAM_PROPERTIES)
+        )
+      end
+
+      def uri_default_param_properties(param_properties)
+        default_properties = {}
+        param_properties.each do |key, property|
+          if value = @params[key]
+            default_properties[property] = value
           end
-          uri
-        when 'jdbc'
-          @params[:jdbc_url] or raise ArgumentError, 'missing jdbc_url parameter'
-        else
-          raise ArgumentError, 'unknown JDBC driver'
         end
+        default_properties
+      end
+
+      JDBC_SNOWFLAKE_PARAM_PROPERTIES = {
+        database: 'db',
+        database_schema: 'schema',
+        warehouse: 'warehouse'
+      }
+
+      def jdbc_uri_snowflake
+        jdbc_uri_generic(
+          add_database: false, separator: '&', first_separator: '/?',
+          default_properties: uri_default_param_properties(JDBC_SNOWFLAKE_PARAM_PROPERTIES)
+        )
       end
 
+      def jdbc_uri_clickhouse
+        protocol_prefix = if protocol = @params[:protocol]
+          raise ArgumentError, "invalid protocol #{protocol}" unless protocol =~ /\A\w+\z/
+          ":#{protocol}"
+        end
+        uri_prefix = "jdbc:ch#{protocol_prefix}://"
+        jdbc_uri_generic(uri_prefix: uri_prefix)
+      end
+
+      def jdbc_uri_jdbc
+        @params[:jdbc_url] or raise ArgumentError, 'missing jdbc_url parameter'
+      end
+
+      JDBC_DRIVER_CLASS = {
+        'postgresql' => 'org.postgresql.Driver',
+        'oracle' => 'oracle.jdbc.OracleDriver',
+        'sqlserver' => 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
+        'vertica' => 'com.vertica.jdbc.Driver',
+        'snowflake' => 'net.snowflake.client.jdbc.SnowflakeDriver',
+        'clickhouse' => 'com.clickhouse.jdbc.ClickHouseDriver',
+        'mariadb' => 'org.mariadb.jdbc.Driver'
+      }
+
       def jdbc_driver
         case @driver
         when 'mysql'
-          'com.mysql.jdbc.Driver'
-        when 'postgresql'
-          'org.postgresql.Driver'
-        when 'oracle'
-          'oracle.jdbc.OracleDriver'
-        when 'luciddb'
-          'org.luciddb.jdbc.LucidDbClientDriver'
-        when 'mssql'
-          'net.sourceforge.jtds.jdbc.Driver'
-        when 'sqlserver'
-          'com.microsoft.sqlserver.jdbc.SQLServerDriver'
-        when 'vertica'
-          'com.vertica.jdbc.Driver'
-        when 'snowflake'
-          'net.snowflake.client.jdbc.SnowflakeDriver'
+          (Java::com.mysql.cj.jdbc.Driver rescue nil) ? 'com.mysql.cj.jdbc.Driver' : 'com.mysql.jdbc.Driver'
         when 'jdbc'
           @params[:jdbc_driver] or raise ArgumentError, 'missing jdbc_driver parameter'
         else
-          raise ArgumentError, 'unknown JDBC driver'
+          JDBC_DRIVER_CLASS[@driver] or raise ArgumentError, 'unknown JDBC driver'
         end
       end
 
@@ -434,6 +480,9 @@ module Mondrian
         end
       end
 
+      # Starting from Mondrian 9.2 additional QueryBody plan string is added at the end which will be ignored.
+      QUERY_BODY_PLAN_REGEXP = /\AQueryBody:/
+
       class ProfilingHandler
         java_implements Java::mondrian.spi.ProfileHandler
         attr_reader :plan
@@ -441,7 +490,11 @@ module Mondrian
 
         java_signature 'void explain(String plan, mondrian.olap.QueryTiming timing)'
         def explain(plan, timing)
-          @plan = plan
+          if @plan
+            @plan += "\n" + plan unless plan =~ QUERY_BODY_PLAN_REGEXP
+          else
+            @plan = plan
+          end
           @timing = timing
         end
       end

data/lib/mondrian/olap/cube.rb

@@ -56,15 +56,35 @@ module Mondrian
       end
 
       def dimensions
-        @dimenstions ||= @raw_cube.getDimensions.map{|d| Dimension.new(self, d)}
+        @dimenstions ||= @raw_cube.getDimensions.map { |d| dimension_from_raw(d) }
       end
 
       def dimension_names
-        dimensions.map{|d| d.name}
+        dimensions.map(&:name)
       end
 
       def dimension(name)
-        dimensions.detect{|d| d.name == name}
+        if @dimensions
+          @dimensions.detect { |d| d.name == name }
+        elsif raw_dimension = @raw_cube.getDimensions.detect { |d| d.getName == name }
+          dimension_from_raw(raw_dimension)
+        end
+      end
+
+      def hierarchies
+        @hierarchies ||= @raw_cube.getHierarchies.map { |h| hierarchy_from_raw(h) }
+      end
+
+      def hierarchy_names
+        hierarchies.map(&:name)
+      end
+
+      def hierarchy(name)
+        if @hierarchies
+          @hierarchies.detect { |h| h.name == name }
+        elsif raw_hierarchy = @raw_cube.getHierarchies.detect { |h| h.getName == name }
+          hierarchy_from_raw(raw_hierarchy)
+        end
       end
 
       def query
@@ -85,6 +105,16 @@ module Mondrian
 
       def_delegators :@cache_control, :flush_region_cache_with_segments, :flush_region_cache_with_segments
       def_delegators :@cache_control, :flush_region_cache_with_full_names, :flush_region_cache_with_full_names
+
+      private
+
+      def dimension_from_raw(raw_dimension)
+        Dimension.new(self, raw_dimension)
+      end
+
+      def hierarchy_from_raw(raw_hierarchy)
+        Hierarchy.new(dimension_from_raw(raw_hierarchy.getDimension), raw_hierarchy)
+      end
     end
 
     class Dimension
@@ -156,7 +186,7 @@ module Mondrian
         @raw_hierarchy = raw_hierarchy
       end
 
-      attr_reader :raw_hierarchy
+      attr_reader :raw_hierarchy, :dimension
 
       def name
         @name ||= @raw_hierarchy.getName
@@ -170,6 +200,10 @@ module Mondrian
         @caption ||= @raw_hierarchy.getCaption
       end
 
+      def dimension_name
+        @dimension.name
+      end
+
       def levels
         @levels = @raw_hierarchy.getLevels.map{|l| Level.new(self, l)}
       end
@@ -257,6 +291,10 @@ module Mondrian
         @cardinality = @raw_level.getCardinality
       end
 
+      def cardinality=(value)
+        mondrian_level.setApproxRowCount(value || Java::JavaLang::Integer::MIN_VALUE)
+      end
+
       def members_count
         @members_count ||= begin
           if cardinality >= 0
@@ -275,6 +313,10 @@ module Mondrian
         end
       end
 
+      def mondrian_level
+        @raw_level.unwrap(Java::MondrianOlap::Level.java_class)
+      end
+
       include Annotated
       def annotations
         annotations_for(@raw_level)

data/lib/mondrian/olap/error.rb

@@ -39,7 +39,7 @@ module Mondrian
 
       def profiling_timing_string
         if profiling_timing && (timing_string = profiling_timing.toString)
-          timing_string.gsub("\r\n", "\n")
+          timing_string.gsub("\r\n", "\n").sub(Mondrian::OLAP::Result::QUERY_TIMING_CUMULATIVE_REGEXP, '')
         end
       end
 
@@ -76,7 +76,15 @@ module Mondrian
           f.accessible = true
           if cell_set = f.value(statement)
             cell_set.close
-            @profiling_handler = statement.getProfileHandler
+            # Starting from Mondrian 9.2 query plan was not available in case of error, need to get it explicitly.
+            if (@profiling_handler = statement.getProfileHandler) && !@profiling_handler.timing
+              query = statement.getQuery
+              string_writer = Java::java.io.StringWriter.new
+              print_writer = Java::java.io.PrintWriter.new(string_writer)
+              query.explain(print_writer)
+              print_writer.close
+              @profiling_handler.explain(string_writer.toString, cell_set.getQueryTiming)
+            end
           end
         end
       end

data/lib/mondrian/olap/query.rb

@@ -296,6 +296,7 @@ module Mondrian
       }
 
       def members_to_mdx(members)
+        members ||= []
         # if only one member which does not end with ] or .Item(...)
         # then assume it is expression which returns set
         # TODO: maybe always include also single expressions in {...} to avoid some edge cases?