mondrian-olap 0.5.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a82185c2c1e818166ad00f6a79629772eda89fd6
-  data.tar.gz: 48189b91d855f7dc3df6842d91360068285be951
+SHA256:
+  metadata.gz: e5b807f5866de6c32810049ddaa15cf62725bdd14db8c92be93828172cc4a0c6
+  data.tar.gz: 34eb04b5545e340509f8699ce499a447a32effee40749e1b580d6063b7d596cf
 SHA512:
-  metadata.gz: d11c3fb9718d6a81be7f534c1b96a6cf731b64019a947a01bbfb58e3a2d52453bd334c5f083ef05981093657f66b3b4572f64748ae0aa4382f4c6a03c445aa9f
-  data.tar.gz: 5f588afd736a0e8c62f05b5a9d56aa75fe181e46373d4025d85522532b8371a3fb439e3d000339ed70ad61d0f8c99ce37e17b9ddc693cfe44a4884ff557c375f
+  metadata.gz: 503b38add95142332eb40c8885075461b98bb2cbbb2f49446b213754a593b94fd2226a965e2d90383e96b163eeab180a5de999cc3631b347060e5c59323ef83b
+  data.tar.gz: 7a9e42bda5d2acc62ccda1da5ab63bb63ad51c49828ed08e89a83e5c4e1a2742118be320c925e7771e29e95166b2e73e26420ac5f7132c4ffb3a2e4221c8ce83

data/Changelog.md

@@ -1,3 +1,89 @@
+### Master
+
+### 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
+  * Upgrade to the latest Mondrian version 8.3.0.5
+  * Tested with JRuby 9.2.9.0
+  * Set query specific timeout
+  * Support for Vertica and Snowflake databases
+* Bug fixes
+  * Handle and wrap TokenMgrError exception
+  * Patch for MONDRIAN-2660
+  * Patch for MONDRIAN-2661
+
+### 1.0.0 / 2019-03-04
+
+* New features
+  * Upgrade to the latest Mondrian version 8.2.0.4
+  * Desupport Java 7, added support for Java 11, tested with JRuby 9.2.6.0
+  * Remove deprecated NativeException, Fixnum
+  * Added Mondrian query profiling option
+  * Added connection flush_schema method and flush_schema(schema_key) class method
+  * Added pin_schema_timeout connection parameter
+* Bug fixes
+  * Fixed parsing of drill through queries with newlines
+  * Do not log Mondrian errors on the console
+  * Fixed handling of dimension names with escaped ]
+  * Patch for MONDRIAN-2641
+
+### 0.9.0 / 2017-10-07
+
+* New features
+  * Upgraded to the latest Mondrian version 3.14.0.5
+  * Added an annotations_hash method for schema elements
+* Bug fixes
+  * Fixed drill through SQL query generation
+  * Set a single role as a union role - used as a workaround for a Mondrian bug
+
+### 0.8.0 / 2016-10-26
+
+* New features
+  * upgraded to the latest Mondrian version 3.12.0.6
+  * added flush_region_cache_with_segments and flush_region_cache_with_full_names methods for partial clearing of the cache
+  * added Name() and Property() extensions for drill_through return fields
+* Bug fixes
+  * fixed retrieving of drill through results with Clob values
+
+### 0.7.0 / 2015-12-12
+
+* New features
+  * upgraded to latest the latest Mondrian version 3.11
+  * removed Java 6 support
+  * fixes for JRuby 9.0 support
+  * added a query builder method "distinct"
+* Improvements
+  * added annotations for dimension_usage and virtual_cube_dimension schema elements
+* Bug fixes
+  * fixed the order of axis aliases - columns, rows, pages, chapters, sections
+
+
+### 0.6.0 / 2014-11-10
+
+* New features
+  * upgraded to latest Mondrian 3.8.0 version
+  * connection with generic JDBC driver using jdbc_driver and jdbc_url parameters
+  * added hierarchy and parent attributes for calculated member schema definition element
+  * added visible attribute for cube, dimension, virtual_cube_dimension, hierarchy and level schema definition elements
+  * added query builder generate method
+  * added schema parameters and query execution with parameters
+  * updated specs to pass on Java 8
+* Improvements
+  * set defaultRowPrefetch property for Oracle connection
+* Bug fixes
+  * fixed result drill_through method with just all members selection
+
 ### 0.5.0 / 2013-11-29
 
 * 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-2013 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

@@ -1,3 +1,6 @@
+[![Travis CI status](https://travis-ci.org/rsim/mondrian-olap.svg?branch=master)](https://travis-ci.org/rsim/mondrian-olap)
+[![AppVeyor status](https://ci.appveyor.com/api/projects/status/08xd4tyty2k3wxba/branch/master?svg=true)](https://ci.appveyor.com/project/rsim/mondrian-olap)
+
 mondrian-olap
 =============
 
@@ -12,7 +15,7 @@ One of the most popular open-source OLAP engines is [Mondrian](http://mondrian.p
 
 mondrian-olap is JRuby gem which includes Mondrian OLAP engine and provides Ruby DSL for creating OLAP schemas on top of relational database schemas and provides MDX query language and query builder Ruby methods for making analytical queries.
 
-mondrian-olap is used in [eazyBI data analysis and reporting web application](https://eazybi.com). [eazyBI remote setup](https://eazybi.com/help/remote-setup) can be used to create easy-to-use web based reports and dashboards on top of mondrian-olap based backend database. There is also [mondrian-olap demo Rails application for trying MDX queries](https://github.com/rsim/mondrian_demo).
+mondrian-olap is used in [eazyBI data analysis and reporting web application](https://eazybi.com). [Private eazyBI](https://eazybi.com/help/private-eazybi) can be used to create easy-to-use web based reports and dashboards on top of mondrian-olap based backend database. There is also [mondrian-olap demo Rails application for trying MDX queries](https://github.com/rsim/mondrian_demo). The [mondrian-rest](https://github.com/jazzido/mondrian-rest) uses mondrian-olap to implement a REST API interface for a Mondrian schema.
 
 USAGE
 -----
@@ -56,42 +59,42 @@ require "mondrian-olap"
 schema = Mondrian::OLAP::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
+    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 '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
       end
     end
-    dimension 'Products', :foreign_key => 'product_id' do
-      hierarchy :has_all => true, :all_member_name => 'All Products',
-                :primary_key => 'id', :primary_key_table => 'products' do
-        join :left_key => 'product_class_id', :right_key => 'id' do
+    dimension 'Products', foreign_key: 'product_id' do
+      hierarchy has_all: true, all_member_name: 'All Products',
+                primary_key: 'id', primary_key_table: 'products' do
+        join left_key: 'product_class_id', right_key: 'id' do
           table 'products'
           table 'product_classes'
         end
-        level 'Product Family', :table => 'product_classes', :column => 'product_family', :unique_members => true
-        level 'Brand Name', :table => 'products', :column => 'brand_name', :unique_members => false
-        level 'Product Name', :table => 'products', :column => 'product_name', :unique_members => true
+        level 'Product Family', table: 'product_classes', column: 'product_family', unique_members: true
+        level 'Brand Name', table: 'products', column: 'brand_name', unique_members: false
+        level 'Product Name', table: 'products', column: 'product_name', unique_members: true
       end
     end
-    dimension 'Time', :foreign_key => 'time_id', :type => 'TimeDimension' do
-      hierarchy :has_all => false, :primary_key => 'id' do
+    dimension 'Time', foreign_key: 'time_id', type: 'TimeDimension' do
+      hierarchy has_all: false, primary_key: 'id' do
         table 'time'
-        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 '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'
       end
-      hierarchy 'Weekly', :has_all => false, :primary_key => 'id' do
+      hierarchy 'Weekly', has_all: false, primary_key: 'id' do
         table 'time'
-        level 'Year', :column => 'the_year', :type => 'Numeric', :unique_members => true, :level_type => 'TimeYears'
-        level 'Week', :column => 'week_of_year', :type => 'Numeric', :unique_members => false, :level_type => 'TimeWeeks'
+        level 'Year', column: 'the_year', type: 'Numeric', unique_members: true, level_type: 'TimeYears'
+        level 'Week', column: 'week_of_year', type: 'Numeric', unique_members: false, level_type: 'TimeWeeks'
       end
     end
-    measure 'Unit Sales', :column => 'unit_sales', :aggregator => 'sum'
-    measure 'Store Sales', :column => 'store_sales', :aggregator => 'sum'
+    measure 'Unit Sales', column: 'unit_sales', aggregator: 'sum'
+    measure 'Store Sales', column: 'store_sales', aggregator: 'sum'
   end
 end
 ```
@@ -104,12 +107,12 @@ When schema is defined it is necessary to establish OLAP connection to database.
 require "jdbc/mysql"
 
 olap = Mondrian::OLAP::Connection.create(
-  :driver => 'mysql',
-  :host => 'localhost,
-  :database => 'mondrian_test',
-  :username => 'mondrian_user',
-  :password => 'secret',
-  :schema => schema
+  driver: 'mysql',
+  host: 'localhost',
+  database: 'mondrian_test',
+  username: 'mondrian_user',
+  password: 'secret',
+  schema: schema
 )
 ```
 
@@ -171,7 +174,7 @@ Here is example of more complex query "Get sales amount and profit % of top 50 p
 olap.from('Sales').
 with_member('[Measures].[ProfitPct]').
   as('Val((Measures.[Store Sales] - Measures.[Store Cost]) / Measures.[Store Sales])',
-  :format_string => 'Percent').
+  format_string: 'Percent').
 columns('[Measures].[Store Sales]', '[Measures].[ProfitPct]').
 rows('[Products].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]').
   top_count(50, '[Measures].[Store Sales]').
@@ -251,13 +254,13 @@ subset of measures and dimension members. Here is example of data access role de
 schema = Mondrian::OLAP::Schema.define do
   # ... cube definitions ...
   role 'California manager' do
-    schema_grant :access => 'none' do
-      cube_grant :cube => 'Sales', :access => 'all' do
-        dimension_grant :dimension => '[Measures]', :access => 'all'
-        hierarchy_grant :hierarchy => '[Customers]', :access => 'custom',
-                        :top_level => '[Customers].[State Province]', :bottom_level => '[Customers].[City]' do
-          member_grant :member => '[Customers].[USA].[CA]', :access => 'all'
-          member_grant :member => '[Customers].[USA].[CA].[Los Angeles]', :access => 'none'
+    schema_grant access: 'none' do
+      cube_grant cube: 'Sales', access: 'all' do
+        dimension_grant dimension: '[Measures]', access: 'all'
+        hierarchy_grant hierarchy: '[Customers]', access: 'custom',
+                        top_level: '[Customers].[State Province]', bottom_level: '[Customers].[City]' do
+          member_grant member: '[Customers].[USA].[CA]', access: 'all'
+          member_grant member: '[Customers].[USA].[CA].[Los Angeles]', access: 'none'
         end
       end
     end
@@ -270,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.6 and 1.7 and Java 6 and 7 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 version 9.2.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 currently supports MySQL, PostgreSQL, Oracle, LucidDB and Microsoft SQL Server databases. 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 (`ojdbc6.jar` for Java 6) 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 include `sqljdbc.jar` or `sqljdbc4.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 and Snowflake 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 (`ojdbc8.jar` for Java 8). 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 require the latest `mssql-jdbc-*.jar`. When using Vertica or Snowflake then require corresponding JDBC drivers.
 
 INSTALL
 -------

data/VERSION

@@ -1 +1 @@
-0.5.0
+1.2.0

data/lib/mondrian/jars/log4j.properties

@@ -1,5 +1,3 @@
-# Logs errors on the console
+# By default do not log anything
 #
-log4j.rootLogger = ERROR, A1
-log4j.appender.A1 = org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=OFF

data/lib/mondrian/olap/connection.rb

@@ -7,9 +7,10 @@ module Mondrian
         connection
       end
 
-      attr_reader :raw_connection, :raw_catalog, :raw_schema
+      attr_reader :raw_connection, :raw_mondrian_connection, :raw_catalog, :raw_schema,
+                  :raw_schema_reader, :raw_cache_control
 
-      def initialize(params={})
+      def initialize(params = {})
         @params = params
         @driver = params[:driver]
         @connected = false
@@ -29,6 +30,13 @@ module Mondrian
           props.setProperty('JdbcUser', @params[:username]) if @params[:username]
           props.setProperty('JdbcPassword', @params[:password]) if @params[:password]
 
+          # on Oracle increase default row prefetch size
+          # as default 10 is very low and slows down loading of all dimension members
+          if @driver == 'oracle'
+            prefetch_rows = @params[:prefetch_rows] || 100
+            props.setProperty("jdbc.defaultRowPrefetch", prefetch_rows.to_s)
+          end
+
           conn_string = connection_string
 
           # latest Mondrian version added ClassResolver which uses current thread class loader to load some classes
@@ -47,6 +55,9 @@ module Mondrian
           @raw_catalog = @raw_connection.getOlapCatalog
           # currently it is assumed that there is just one schema per connection catalog
           @raw_schema = @raw_catalog.getSchemas.first
+          @raw_mondrian_connection = @raw_connection.getMondrianConnection
+          @raw_schema_reader = @raw_mondrian_connection.getSchemaReader
+          @raw_cache_control = @raw_mondrian_connection.getCacheControl(nil)
           @connected = true
           true
         end
@@ -57,16 +68,31 @@ module Mondrian
       end
 
       def close
+        @raw_jdbc_connection = @raw_catalog = @raw_schema = @raw_mondrian_connection = nil
+        @raw_schema_reader = @raw_cache_control = nil
         @raw_connection.close
+        @raw_connection = nil
         @connected = false
-        @raw_connection = @raw_jdbc_connection = nil
         true
       end
 
-      def execute(query_string)
-        Error.wrap_native_exception do
+      def execute(query_string, parameters = {})
+        options = {}
+        Error.wrap_native_exception(options) do
+          start_time = Time.now
           statement = @raw_connection.prepareOlapStatement(query_string)
-          Result.new(self, statement.executeQuery())
+          options[:profiling_statement] = statement if parameters[:profiling]
+          set_statement_parameters(statement, parameters)
+          raw_cell_set = statement.executeQuery()
+          total_duration = ((Time.now - start_time) * 1000).to_i
+          Result.new(self, raw_cell_set, profiling_handler: statement.getProfileHandler, total_duration: total_duration)
+        end
+      end
+
+      # access mondrian.olap.Parameter object
+      def mondrian_parameter(parameter_name)
+        Error.wrap_native_exception do
+          @raw_schema_reader.getParameter(parameter_name)
         end
       end
 
@@ -81,6 +107,36 @@ module Mondrian
         Query.from(self, cube_name)
       end
 
+      def raw_schema_key
+        @raw_mondrian_connection.getSchema.getKey
+      end
+
+      def schema_key
+        raw_schema_key.toString
+      end
+
+      def self.raw_schema_key(schema_key)
+        if schema_key =~ /\A<(.*), (.*)>\z/
+          schema_content_key = $1
+          connection_key = $2
+
+          cons = Java::mondrian.rolap.SchemaContentKey.java_class.declared_constructor(java.lang.String)
+          cons.accessible = true
+          raw_schema_content_key = cons.new_instance(schema_content_key)
+
+          cons = Java::mondrian.rolap.ConnectionKey.java_class.declared_constructor(java.lang.String)
+          cons.accessible = true
+          raw_connection_key = cons.new_instance(connection_key)
+
+          cons = Java::mondrian.rolap.SchemaKey.java_class.declared_constructor(
+            Java::mondrian.rolap.SchemaContentKey, Java::mondrian.rolap.ConnectionKey)
+          cons.accessible = true
+          cons.new_instance(raw_schema_content_key, raw_connection_key)
+        else
+          raise ArgumentError, "invalid schema key #{schema_key}"
+        end
+      end
+
       def cube_names
         @raw_schema.getCubes.map{|c| c.getName}
       end
@@ -91,12 +147,37 @@ module Mondrian
 
       # Will affect only the next created connection. If it is necessary to clear all schema cache then
       # flush_schema_cache should be called, then close and then new connection should be created.
+      # This method flushes schemas for all connections (clears the schema pool).
       def flush_schema_cache
-        unwrapped_connection = @raw_connection.unwrap(Java::MondrianOlap::Connection.java_class)
-        raw_cache_control = unwrapped_connection.getCacheControl(nil)
         raw_cache_control.flushSchemaCache
       end
 
+      def self.raw_schema_pool
+        method = Java::mondrian.rolap.RolapSchemaPool.java_class.declared_method('instance')
+        method.accessible = true
+        method.invoke_static
+      end
+
+      def self.flush_schema_cache
+        method = Java::mondrian.rolap.RolapSchemaPool.java_class.declared_method('clear')
+        method.accessible = true
+        method.invoke(raw_schema_pool)
+      end
+
+      # This method flushes the schema only for this connection (removes from the schema pool).
+      def flush_schema
+        if raw_mondrian_connection && (rolap_schema = raw_mondrian_connection.getSchema)
+          raw_cache_control.flushSchema(rolap_schema)
+        end
+      end
+
+      def self.flush_schema(schema_key)
+        method = Java::mondrian.rolap.RolapSchemaPool.java_class.declared_method('remove',
+          Java::mondrian.rolap.SchemaKey.java_class)
+        method.accessible = true
+        method.invoke(raw_schema_pool, raw_schema_key(schema_key))
+      end
+
       def available_role_names
         @raw_connection.getAvailableRoleNames.to_a
       end
@@ -121,7 +202,9 @@ module Mondrian
         Error.wrap_native_exception do
           # workaround to access non-public method (was not public when using inside Torquebox)
           # @raw_connection.setRoleNames(Array(names))
-          @raw_connection.java_method(:setRoleNames, [Java::JavaUtil::List.java_class]).call(Array(names))
+          names = Array(names)
+          @raw_connection.java_method(:setRoleNames, [Java::JavaUtil::List.java_class]).call(names)
+          names
         end
       end
 
@@ -131,7 +214,7 @@ module Mondrian
 
       def locale=(locale)
         locale_elements = locale.to_s.split('_')
-        raise ArgumentError, "invalid locale string #{locale.inspect}" unless [1,2,3].include?(locale_elements.length)
+        raise ArgumentError, "invalid locale string #{locale.inspect}" unless [1, 2, 3].include?(locale_elements.length)
         java_locale = Java::JavaUtil::Locale.new(*locale_elements)
         @raw_connection.setLocale(java_locale)
       end
@@ -195,6 +278,14 @@ module Mondrian
           pool.close if pool && !pool.isClosed
         end
 
+        # unregister MBean
+        mbs = Java::JavaLangManagement::ManagementFactory.getPlatformMBeanServer
+        mbean_name = Java::JavaxManagement::ObjectName.new("mondrian.server:type=Server-#{static_mondrian_server.getId}")
+        begin
+          mbs.unregisterMBean(mbean_name)
+        rescue Java::JavaxManagement::InstanceNotFoundException
+        end
+
         true
       end
 
@@ -203,79 +294,137 @@ module Mondrian
       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 += "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'
-          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}"
-            end
-          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
+        if respond_to?(method_name = "jdbc_uri_#{@driver}", true)
+          send method_name
         else
           raise ArgumentError, 'unknown JDBC driver'
         end
       end
 
+      def jdbc_uri_generic(options = {})
+        uri_prefix = options[:uri_prefix] || "jdbc:#{@driver}://"
+        uri = "#{uri_prefix}#{@params[:host]}#{@params[:port] && ":#{@params[: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
+
+      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
+        end
+      end
+
+      def jdbc_uri_mssql
+        jdbc_uri_generic(
+          uri_prefix: 'jdbc:jtds:sqlserver://', separator: ';', first_separator: ';',
+          default_properties: @params.slice(:instance, :domain, :appname)
+        )
+      end
+
+      JDBC_SQLSERVER_PARAM_PROPERTIES = {
+        database: 'databaseName',
+        integrated_security: 'integratedSecurity',
+        application_name: 'applicationName',
+        instance_name: '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
+        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_jdbc
+        @params[:jdbc_url] or raise ArgumentError, 'missing jdbc_url parameter'
+      end
+
+      JDBC_DRIVER_CLASS = {
+        'postgresql' => 'org.postgresql.Driver',
+        'oracle' => 'oracle.jdbc.OracleDriver',
+        'mssql' => 'net.sourceforge.jtds.jdbc.Driver',
+        'sqlserver' => 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
+        'vertica' => 'com.vertica.jdbc.Driver',
+        'snowflake' => 'net.snowflake.client.jdbc.SnowflakeDriver'
+      }
+
       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'
+          (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
 
@@ -298,7 +447,43 @@ module Mondrian
       end
 
       def quote_string(string)
-        "'#{string.gsub("'","''")}'"
+        "'#{string.gsub("'", "''")}'"
+      end
+
+      def set_statement_parameters(statement, parameters)
+        if parameters && !parameters.empty?
+          parameters = parameters.dup
+          # define addtional parameters which can be accessed from user defined functions
+          if define_parameters = parameters.delete(:define_parameters)
+            query_validator = statement.getQuery.createValidator
+            define_parameters.each do |dp_name, dp_value|
+              dp_type_class = dp_value.is_a?(Numeric) ? Java::MondrianOlapType::NumericType : Java::MondrianOlapType::StringType
+              query_validator.createOrLookupParam(true, dp_name, dp_type_class.new, nil, nil)
+              parameters[dp_name] = dp_value
+            end
+          end
+          if parameters.delete(:profiling)
+            statement.enableProfiling(ProfilingHandler.new)
+          end
+          if timeout = parameters.delete(:timeout)
+            statement.getQuery.setQueryTimeoutMillis(timeout * 1000)
+          end
+          parameters.each do |parameter_name, value|
+            statement.getQuery.setParameter(parameter_name, value)
+          end
+        end
+      end
+
+      class ProfilingHandler
+        java_implements Java::mondrian.spi.ProfileHandler
+        attr_reader :plan
+        attr_reader :timing
+
+        java_signature 'void explain(String plan, mondrian.olap.QueryTiming timing)'
+        def explain(plan, timing)
+          @plan = plan
+          @timing = timing
+        end
       end
 
     end