mondrian-olap 0.1.0 → 0.2.0

data/Changelog.md

@@ -0,0 +1,22 @@
+### 0.2.0 / 2011-07-01
+
+* New features
+  * support for LucidDB database
+* Improvements
+  * only set log4j configuration file if not set already (possible to override e.g. Mondrian debugging settings)
+  * `result.to_html(:formatted=>true)` will return formatted results
+  * set Unicode encoding for mysql connection
+  * `format_string` attribute and `formula` element for calculated members
+  * `:use_content_checksum` connection option (by default set to true)
+  * `key_expression`, `name_expression`, `ordinal_expression` elements with `sql` subelement support for levels
+  * `:upcase_data_dictionary` option for schema definition
+* Bug fixes
+  * fixed examples in README
+  * correctly quote `CatalogContent` in connection string (to allow usage of semicolons in generated XML catalog)
+  * workarounds for issues with Java classloader when using in production mode with jruby-rack
+  * construct correct file path on Windows
+
+### 0.1.0 / 2011-03-18
+
+* Initial release
+  * support for MySQL, PostgreSQL and Oracle databases

data/Gemfile

@@ -5,10 +5,12 @@ gem 'nokogiri', '~> 1.5.0.beta.4'
 group :development do
   gem 'jruby-openssl'
   gem 'jeweler', '~> 1.5.2'
+  gem 'rdoc'
   gem 'rspec', '~> 2.5'
   gem 'autotest'
   gem 'jdbc-mysql'
   gem 'jdbc-postgres'
+  gem 'jdbc-luciddb'
   gem 'activerecord', '~> 3.0.5'
   gem 'activerecord-jdbc-adapter'
   gem 'activerecord-oracle_enhanced-adapter', :require => false

data/README.rdoc

@@ -100,7 +100,7 @@ When schema is defined it is necessary to establish OLAP connection to database.
     :host => 'localhost,
     :database => 'mondrian_test',
     :username => 'mondrian_user',
-    :password => 'secret'
+    :password => 'secret',
     :schema => schema
   )
 
@@ -111,7 +111,7 @@ mondrian-olap allows executing of MDX queries, for example query for "Get sales
 
   result = olap.execute <<-MDX
     SELECT  {[Measures].[Unit Sales], [Measures].[Store Sales]} ON COLUMNS,
-            {[Product].children} ON ROWS
+            {[Products].children} ON ROWS
       FROM  [Sales]
       WHERE ([Time].[2010].[Q1], [Customers].[USA].[CA])
   MDX
@@ -135,7 +135,7 @@ and then get axis and cells of result object:
   result.column_names       # => ["Unit Sales", "Store Sales"]
   result.column_full_names  # => ["[Measures].[Unit Sales]", "[Measures].[Store Sales]"]
   result.row_names          # => e.g. ["Drink", "Food", "Non-Consumable"]
-  result.row_full_names     # => e.g. ["[Product].[Drink]", "[Product].[Food]", "[Product].[Non-Consumable]"]
+  result.row_full_names     # => e.g. ["[Products].[Drink]", "[Products].[Food]", "[Products].[Non-Consumable]"]
   result.values             # => [[..., ...], [..., ...], [..., ...]]
                             # (three rows, each row containing value for "unit sales" and "store sales")
 
@@ -146,8 +146,9 @@ Previous MDX query can be executed as:
 
   olap.from('Sales').
   columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
-  rows('[Product].children').
-  where('[Time].[2010].[Q1]', '[Customers].[USA].[CA]')
+  rows('[Products].children').
+  where('[Time].[2010].[Q1]', '[Customers].[USA].[CA]').
+  execute
 
 Here is example of more complex query "Get sales amount and profit % of top 50 products cross-joined with USA and Canada country sales during Q1 of 2010":
 
@@ -156,9 +157,10 @@ Here is example of more complex query "Get sales amount and profit % of top 50 p
     as('Val((Measures.[Store Sales] - Measures.[Store Cost]) / Measures.[Store Sales])',
     :format_string => 'Percent').
   columns('[Measures].[Store Sales]', '[Measures].[ProfitPct]').
-  rows('[Product].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]').
-    top_count(50, '[Measures].[Store Sales]')
-  where('[Time].[2010].[Q1]')
+  rows('[Products].children').crossjoin('[Customers].[Canada]', '[Customers].[USA]').
+    top_count(50, '[Measures].[Store Sales]').
+  where('[Time].[2010].[Q1]').
+  execute
 
 See more examples of queries in spec/query_spec.rb.
 
@@ -193,7 +195,7 @@ See more examples of dimension and member queries in spec/cube_spec.rb.
 
 mondrian-olap gem is compatible with JRuby versions 1.5 and 1.6 (have not been tested with earlier versions). 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 and Oracle databases. When using MySQL or PostgreSQL databases then install jdbc-mysql or jdbc-postgres gem and require "jdbc/mysql" or "jdbc/postgres" to load corresponding JDBC database driver. When using Oracle then include Oracle JDBC driver (ojdbc14.jar or ojdbc6.jar) in CLASSPATH or copy to JRUBY_HOME/lib.
+mondrian-olap currently supports MySQL, PostgreSQL, Oracle and LucidDB 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 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.
 
 == INSTALL
 

data/RUNNING_TESTS.rdoc

@@ -1,11 +1,13 @@
 == Creating test database
 
-By default unit tests use MySQL database but PostgreSQL and Oracle databases are supported as well. Set MONDRIAN_DRIVER environment variable to "mysql" (default), "postgresql" or "oracle" to specify database driver that should be used.
+By default unit tests use MySQL database but PostgreSQL and Oracle databases are supported as well. Set MONDRIAN_DRIVER environment variable to "mysql" (default), "postgresql", "oracle" or "luciddb" to specify database driver that should be used.
 
 If using MySQL or PostgreSQL database then create database user mondrian_test with password mondrian_test, create database mondrian_test and grant full access to this database for mondrian_test user. By default it is assumed that database is located on localhost (can be overridden with DATABASE_HOST environment variable).
 
 If using Oracle database then create database user mondrian_test with password mondrian_test. By default it is assumed that database orcl is located on localhost (can be overridden with DATABASE_NAME and DATABASE_HOST environment variables).
 
+If using LucidDB database then create schema MONDRIAN_TEST and create user MONDRIAN_TEST with password mondrian_test and with default schema MONDRIAN_TEST. By default it is assumed that database is located on localhost (can be overridden with DATABASE_HOST environment variable).
+
 See spec/spec_helper.rb for details of default connection parameters and how to override them.
 
 == Creating test data
@@ -24,6 +26,11 @@ or specify which database driver to use
   rake db:create_data MONDRIAN_DRIVER=postgresql
   rake db:create_data MONDRIAN_DRIVER=oracle
 
+In case of LucidDB data are not generated and inserted directly into database but are imported from MySQL mondrian_test database (because inserting individual records into LucidDB is very inefficient). Therefore at first generate test data with mysql (using default database settings) and then run data creation task for LucidDB.
+
+  rake db:create_data MONDRIAN_DRIVER=mysql
+  rake db:create_data MONDRIAN_DRIVER=luciddb
+
 == Running tests
 
 Run tests with
@@ -35,7 +42,19 @@ or specify which database driver to use
   rake spec MONDRIAN_DRIVER=mysql
   rake spec MONDRIAN_DRIVER=postgresql
   rake spec MONDRIAN_DRIVER=oracle
+  rake spec MONDRIAN_DRIVER=luciddb
+
+or also alternatively with
+
+  rake spec:mysql
+  rake spec:postgresql
+  rake spec:oracle
+  rake spec:luciddb
+
+You can also run all tests on all databases with
+
+  rake spec:all
 
 == JRuby versions
 
-It is recommended to use RVM (http://rvm.beginrescueend.com) to run tests with different JRuby implementations. mondrian-olap has been tested with JRuby 1.5 and 1.6 release candidate versions.
+It is recommended to use RVM (http://rvm.beginrescueend.com) to run tests with different JRuby implementations. mondrian-olap is being tested with latest versions of JRuby 1.6 on Java 6.

data/Rakefile

@@ -33,8 +33,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'doc'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mondrian/jars/log4j.properties

@@ -1,18 +1,5 @@
+# Logs errors on the console
 #
-# Log4J Konfiguration
-#
-# - Logs errors on the console
-#
-
 log4j.rootLogger = ERROR, A1
-
-# Logging to console
 log4j.appender.A1 = org.apache.log4j.ConsoleAppender
-
-# Logging message format
-# %d{DATE} Datum im Format dd MMM YYYY HH:mm:ss,SSS
-# %-5p Priorität der Meldung 5stellig
-# %m Meldung
-# %n Zeilenumbruch
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-# log4j.appender.A1.layout.ConversionPattern=[JPivot] %d{DATE} %-5p [Session %X{SessionID}] %C#%M: %m%n

data/lib/mondrian/olap.rb

@@ -5,7 +5,10 @@ Dir["#{directory}/*.jar"].each do |file|
   require file
 end
 
-java.lang.System.setProperty("log4j.configuration", "file://#{directory}/log4j.properties")
+unless java.lang.System.getProperty("log4j.configuration")
+  file_uri = java.io.File.new("#{directory}/log4j.properties").toURI.to_s
+  java.lang.System.setProperty("log4j.configuration", file_uri)
+end
 # register Mondrian olap4j driver
 Java::mondrian.olap4j.MondrianOlap4jDriver
 

data/lib/mondrian/olap/connection.rb

@@ -17,7 +17,29 @@ module Mondrian
       end
 
       def connect
-        @raw_jdbc_connection = Java::JavaSql::DriverManager.getConnection(connection_string)
+        # hack to call private constructor of MondrianOlap4jDriver
+        # to avoid using DriverManager which fails to load JDBC drivers
+        # because of not seeing JRuby required jar files
+        cons = Java::MondrianOlap4j::MondrianOlap4jDriver.java_class.declared_constructor
+        cons.accessible = true
+        driver = cons.new_instance.to_java
+
+        props = java.util.Properties.new
+        props.setProperty('JdbcUser', @params[:username]) if @params[:username]
+        props.setProperty('JdbcPassword', @params[:password]) if @params[:password]
+
+        conn_string = connection_string
+
+        # workaround for Mondrian ServiceDiscovery
+        current_thread = Java::JavaLang::Thread.currentThread
+        class_loader = current_thread.getContextClassLoader
+        begin
+          current_thread.setContextClassLoader(nil)
+          @raw_jdbc_connection = driver.connect(conn_string, props)
+        ensure
+          current_thread.setContextClassLoader(class_loader)
+        end
+
         @raw_connection = @raw_jdbc_connection.unwrap(Java::OrgOlap4j::OlapConnection.java_class)
         @raw_schema = @raw_connection.getSchema
         @connected = true
@@ -63,24 +85,30 @@ module Mondrian
       private
 
       def connection_string
-        "jdbc:mondrian:Jdbc=#{jdbc_uri};JdbcDrivers=#{jdbc_driver};" <<
-          (@params[:catalog] ? "Catalog=#{catalog_uri}" : "CatalogContent=#{catalog_content}")
+        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 << (@params[:catalog] ? "Catalog=#{catalog_uri}" : "CatalogContent=#{quote_string(catalog_content)}")
       end
 
       def jdbc_uri
         case @driver
         when 'mysql', 'postgresql'
-          "jdbc:#{@driver}://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}/#{@params[:database]}" <<
-          "?user=#{@params[:username]}&password=#{@params[:password]}"
+          uri = "jdbc:#{@driver}://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}/#{@params[:database]}"
+          uri << "?useUnicode=yes&characterEncoding=UTF-8" if @driver == 'mysql'
+          uri
         when 'oracle'
           # connection using TNS alias
           if @params[:database] && !@params[:host] && !@params[:url] && ENV['TNS_ADMIN']
-            "jdbc:oracle:thin:#{@params[:username]}/#{@params[:password]}@#{@params[:database]}"
+            "jdbc:oracle:thin:@#{@params[:database]}"
           else
             @params[:url] ||
-            "jdbc:oracle:thin:#{@params[:username]}/#{@params[:password]}" <<
-            "@#{@params[:host] || 'localhost'}:#{@params[:port] || 1521}:#{@params[:database]}"
+            "jdbc:oracle:thin:@#{@params[:host] || 'localhost'}:#{@params[:port] || 1521}:#{@params[:database]}"
           end
+        when 'luciddb'
+          uri = "jdbc:luciddb:http://#{@params[:host]}#{@params[:port] && ":#{@params[:port]}"}"
+          uri << ";schema=#{@params[:database_schema]}" if @params[:database_schema]
+          uri
         else
           raise ArgumentError, 'unknown JDBC driver'
         end
@@ -94,6 +122,8 @@ module Mondrian
           'org.postgresql.Driver'
         when 'oracle'
           'oracle.jdbc.OracleDriver'
+        when 'luciddb'
+          'org.luciddb.jdbc.LucidDbClientDriver'
         else
           raise ArgumentError, 'unknown JDBC driver'
         end
@@ -117,6 +147,10 @@ module Mondrian
         end
       end
 
+      def quote_string(string)
+        "'#{string.gsub("'","''")}'"
+      end
+
     end
   end
 end

data/lib/mondrian/olap/result.rb

@@ -56,7 +56,7 @@ module Mondrian
       end
 
       # format results in simple HTML table
-      def to_html
+      def to_html(options = {})
         case axes_count
         when 1
           builder = Nokogiri::XML::Builder.new do |doc|
@@ -68,7 +68,7 @@ module Mondrian
                 end
               end
               doc.tr do
-                values.each do |value|
+                (options[:formatted] ? formatted_values : values).each do |value|
                   doc.td value, :align => 'right'
                 end
               end
@@ -85,7 +85,7 @@ module Mondrian
                   doc.th column_full_name, :align => 'right'
                 end
               end
-              values.each_with_index do |row, i|
+              (options[:formatted] ? formatted_values : values).each_with_index do |row, i|
                 doc.tr do
                   row_full_name = row_full_names[i].is_a?(Array) ? row_full_names[i].join(',') : row_full_names[i]
                   doc.th row_full_name, :align => 'left'

data/lib/mondrian/olap/schema.rb

@@ -5,21 +5,49 @@ module Mondrian
     # See http://mondrian.pentaho.com/documentation/schema.php for more detailed description
     # of Mondrian Schema elements.
     class Schema < SchemaElement
+      def initialize(name = nil, attributes = {}, &block)
+        name, attributes = self.class.pre_process_arguments(name, attributes)
+        pre_process_attributes(attributes)
+        super(name, attributes, &block)
+      end
+
       def self.define(name = nil, attributes = {}, &block)
+        name, attributes = pre_process_arguments(name, attributes)
         new(name || 'default', attributes, &block)
       end
 
-      def define(name = nil, &block)
-        @attributes[:name] = name || 'default' # otherwise connection with empty name fails
+      def define(name = nil, attributes = {}, &block)
+        name, attributes = self.class.pre_process_arguments(name, attributes)
+        pre_process_attributes(attributes)
+        @attributes[:name] = name || @attributes[:name] || 'default' # otherwise connection with empty name fails
         instance_eval &block if block
         self
       end
 
-      attributes :description
+      private
+
+      def self.pre_process_arguments(name, attributes)
+        # if is called just with attributes hash and without name
+        if name.is_a?(Hash) && attributes.empty?
+          attributes = name
+          name = nil
+        end
+        [name, attributes]
+      end
+
+      def pre_process_attributes(attributes)
+        unless attributes[:upcase_data_dictionary].nil?
+          @upcase_data_dictionary = attributes.delete(:upcase_data_dictionary)
+        end
+      end
+
+      public
+
+      attributes :name, :description
       elements :cube
 
       class Cube < SchemaElement
-        attributes :description,
+        attributes :name, :description,
           # The name of the measure that would be taken as the default measure of the cube.
           :default_measure,
           # Should the Fact table data for this Cube be cached by Mondrian or not.
@@ -31,7 +59,7 @@ module Mondrian
       end
 
       class Table < SchemaElement
-        attributes :schema, # Optional qualifier for table.
+        attributes :name, :schema, # Optional qualifier for table.
           # Alias to be used with this table when it is used to form queries.
           # If not specified, defaults to the table name, but in any case, must be unique within the schema.
           # (You can use the same table in different hierarchies, but it must have different aliases.)
@@ -40,7 +68,7 @@ module Mondrian
       end
 
       class Dimension < SchemaElement
-        attributes :description,
+        attributes :name, :description,
           # The dimension's type may be one of "Standard" or "Time".
           # A time dimension will allow the use of the MDX time functions (WTD, YTD, QTD, etc.).
           # Use a standard dimension if the dimension is not a time-related dimension.
@@ -54,7 +82,7 @@ module Mondrian
       end
 
       class Hierarchy < SchemaElement
-        attributes :description,
+        attributes :name, :description,
           # Whether this hierarchy has an 'all' member.
           :has_all,
           # Name of the 'all' member. If this attribute is not specified,
@@ -83,7 +111,7 @@ module Mondrian
       end
 
       class Level < SchemaElement
-        attributes :description,
+        attributes :name, :description,
           # The name of the table that the column comes from.
           # If this hierarchy is based upon just one table, defaults to the name of that table;
           # otherwise, it is required.
@@ -128,10 +156,31 @@ module Mondrian
           # Default value: 'Never'
           :hide_member_if
         data_dictionary_names :table, :column, :name_column, :ordinal_column, :parent_column # values in XML will be uppercased when using Oracle driver
+        elements :key_expression, :name_expression, :ordinal_expression
+      end
+
+      class KeyExpression < SchemaElement
+        elements :sql
+      end
+
+      class NameExpression < SchemaElement
+        elements :sql
+      end
+
+      class OrdinalExpression < SchemaElement
+        elements :sql
+      end
+
+      class Sql < SchemaElement
+        def self.name
+          'SQL'
+        end
+        attributes :dialect
+        content :text
       end
 
       class Measure < SchemaElement
-        attributes :description,
+        attributes :name, :description,
           # Column which is source of this measure's values.
           # If not specified, a measure expression must be specified.
           :column,
@@ -146,11 +195,25 @@ module Mondrian
       end
 
       class CalculatedMember < SchemaElement
-        attributes :description,
-          # MDX expression which gives the value of this member. Equivalent to the Formula sub-element.
-          :formula,
+        attributes :name, :description,
           # Name of the dimension which this member belongs to.
-          :dimension
+          :dimension,
+          # Format string with which to format cells of this measure. For more details, see the mondrian.util.Format class.
+          :format_string
+        elements :formula, :calculated_member_property
+      end
+
+      class Formula < SchemaElement
+        content :text
+      end
+
+      class CalculatedMemberProperty < SchemaElement
+        attributes :name, :description,
+          # MDX expression which defines the value of this property. If the expression is a constant string, you could enclose it in quotes,
+          # or just specify the 'value' attribute instead.
+          :expression,
+          # Value of this property. If the value is not constant, specify the 'expression' attribute instead.
+          :value
       end
 
     end

data/lib/mondrian/olap/schema_element.rb

@@ -10,7 +10,13 @@ module Mondrian
           name = nil
         end
         @attributes = {}
-        @attributes[:name] = name if name
+        if name
+          if self.class.content
+            @content = name
+          else
+            @attributes[:name] = name
+          end
+        end
         @attributes.merge!(attributes)
         self.class.elements.each do |element|
           instance_variable_set("@#{pluralize(element)}", [])
@@ -56,7 +62,13 @@ module Mondrian
         end
       end
 
+      def self.content(type=nil)
+        return @content if type.nil?
+        @content = type
+      end
+
       def to_xml(options={})
+        options[:upcase_data_dictionary] = @upcase_data_dictionary unless @upcase_data_dictionary.nil?
         Nokogiri::XML::Builder.new do |xml|
           add_to_xml(xml, options)
         end.to_xml
@@ -65,9 +77,13 @@ module Mondrian
       protected
 
       def add_to_xml(xml, options)
-        xml.send(tag_name(self.class.name), xmlized_attributes(options)) do
-          self.class.elements.each do |element|
-            instance_variable_get("@#{pluralize(element)}").each {|item| item.add_to_xml(xml, options)}
+        if self.class.content
+          xml.send(tag_name(self.class.name), @content, xmlized_attributes(options))
+        else
+          xml.send(tag_name(self.class.name), xmlized_attributes(options)) do
+            self.class.elements.each do |element|
+              instance_variable_get("@#{pluralize(element)}").each {|item| item.add_to_xml(xml, options)}
+            end
           end
         end
       end
@@ -75,8 +91,10 @@ module Mondrian
       private
 
       def xmlized_attributes(options)
-        # data dictionary values should be in uppercase when using Oracle driver
-        upcase_attributes = if options[:driver] == 'oracle'
+        # data dictionary values should be in uppercase if schema defined with :upcase_data_dictionary => true
+        # or by default when using Oracle or LucidDB driver (can be overridden by :upcase_data_dictionary => false)
+        upcase_attributes = if options[:upcase_data_dictionary].nil? && %w(oracle luciddb).include?(options[:driver]) ||
+                            options[:upcase_data_dictionary]
           self.class.data_dictionary_names
         else
           []

data/mondrian-olap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mondrian-olap}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-07-01}
   s.description = %q{JRuby gem for performing multidimensional queries of relational database data using Mondrian OLAP Java library
 }
   s.email = %q{raimonds.simanovskis@gmail.com}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    "Changelog.md",
     "Gemfile",
     "LICENSE-Mondrian.html",
     "LICENSE.txt",
@@ -81,10 +82,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<jdbc-mysql>, [">= 0"])
       s.add_development_dependency(%q<jdbc-postgres>, [">= 0"])
+      s.add_development_dependency(%q<jdbc-luciddb>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.0.5"])
       s.add_development_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
       s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])
@@ -92,10 +95,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<jdbc-mysql>, [">= 0"])
       s.add_dependency(%q<jdbc-postgres>, [">= 0"])
+      s.add_dependency(%q<jdbc-luciddb>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
       s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
       s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])
@@ -104,10 +109,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<jdbc-mysql>, [">= 0"])
     s.add_dependency(%q<jdbc-postgres>, [">= 0"])
+    s.add_dependency(%q<jdbc-luciddb>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
     s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
     s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])

data/spec/fixtures/MondrianTest.xml

@@ -61,6 +61,9 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
+          </SQL>
+          <SQL dialect="luciddb">
+"fname" || ' ' || "lname"
           </SQL>
           <SQL dialect="generic">
 fullname
@@ -75,6 +78,9 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
+          </SQL>
+          <SQL dialect="luciddb">
+"fname" || ' ' || "lname"
           </SQL>
           <SQL dialect="generic">
 fullname

data/spec/fixtures/MondrianTestOracle.xml

@@ -61,6 +61,9 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
+          </SQL>
+          <SQL dialect="luciddb">
+fname || ' ' || lname
           </SQL>
           <SQL dialect="generic">
 FULLNAME
@@ -75,6 +78,9 @@ fname || ' ' || lname
           </SQL>
           <SQL dialect="mysql">
 CONCAT(`customer`.`fname`, ' ', `customer`.`lname`)
+          </SQL>
+          <SQL dialect="luciddb">
+fname || ' ' || lname
           </SQL>
           <SQL dialect="generic">
 FULLNAME

data/spec/query_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 describe "Query" do
+  def quote_table_name(name)
+    ActiveRecord::Base.connection.quote_table_name(name)
+  end
+
   before(:all) do
     @olap = Mondrian::OLAP::Connection.create(CONNECTION_PARAMS_WITH_CATALOG)
     @sql = ActiveRecord::Base.connection
@@ -17,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 time ON sales.time_id = time.id
+      LEFT JOIN #{quote_table_name('time')} ON sales.time_id = #{quote_table_name('time')}.id
       LEFT JOIN customers ON sales.customer_id = customers.id
-    WHERE time.the_year = 2010 AND time.quarter = 'Q1'
+    WHERE #{quote_table_name('time')}.the_year = 2010 AND #{quote_table_name('time')}.quarter = 'Q1'
       AND customers.country = 'USA' AND customers.state_province = 'CA'
     GROUP BY product_classes.product_family
     ORDER BY product_classes.product_family

data/spec/rake_tasks.rb

@@ -53,133 +53,208 @@ namespace :db do
     end
   end
 
+  task :setup_luciddb => :require_spec_helper do
+    # create link to mysql database to import tables
+    # see description at http://pub.eigenbase.org/wiki/LucidDbCreateForeignServer
+    if MONDRIAN_DRIVER == 'luciddb'
+      conn = ActiveRecord::Base.connection
+      conn.execute "drop schema mondrian_test_source cascade" rescue nil
+      conn.execute "drop server mondrian_test_source" rescue nil
+      conn.execute "create schema mondrian_test_source"
+      conn.execute <<-SQL
+        create server mondrian_test_source
+        foreign data wrapper sys_jdbc
+        options(
+            driver_class 'com.mysql.jdbc.Driver',
+            url 'jdbc:mysql://localhost/mondrian_test?characterEncoding=utf-8&useCursorFetch=true',
+            user_name 'mondrian_test',
+            password 'mondrian_test',
+            login_timeout '10',
+            fetch_size '1000',
+            validation_query 'select 1',
+            schema_name 'MONDRIAN_TEST',
+            table_types 'TABLE')
+      SQL
+      conn.execute "import foreign schema mondrian_test from server mondrian_test_source into mondrian_test_source"
+    end
+  end
+
   task :define_models => :require_spec_helper do
-    class TimeDimension < ActiveRecord::Base
-      set_table_name "time"
-      validates_presence_of :the_date
-      before_create do
-        self.the_day = the_date.strftime("%A")
-        self.the_month = the_date.strftime("%B")
-        self.the_year = the_date.strftime("%Y").to_i
-        self.day_of_month = the_date.strftime("%d").to_i
-        self.week_of_year = the_date.strftime("%W").to_i
-        self.month_of_year = the_date.strftime("%m").to_i
-        self.quarter = "Q#{(month_of_year-1)/3+1}"
+    unless MONDRIAN_DRIVER == 'luciddb'
+      class TimeDimension < ActiveRecord::Base
+        set_table_name "time"
+        validates_presence_of :the_date
+        before_create do
+          self.the_day = the_date.strftime("%A")
+          self.the_month = the_date.strftime("%B")
+          self.the_year = the_date.strftime("%Y").to_i
+          self.day_of_month = the_date.strftime("%d").to_i
+          self.week_of_year = the_date.strftime("%W").to_i
+          self.month_of_year = the_date.strftime("%m").to_i
+          self.quarter = "Q#{(month_of_year-1)/3+1}"
+        end
+      end
+      class Product < ActiveRecord::Base
+        belongs_to :product_class
+      end
+      class ProductClass < ActiveRecord::Base
+      end
+      class Customer < ActiveRecord::Base
+      end
+      class Sales < ActiveRecord::Base
+        set_table_name "sales"
+        belongs_to :time_by_day
+        belongs_to :product
+        belongs_to :customer
       end
-    end
-    class Product < ActiveRecord::Base
-      belongs_to :product_class
-    end
-    class ProductClass < ActiveRecord::Base
-    end
-    class Customer < ActiveRecord::Base
-    end
-    class Sales < ActiveRecord::Base
-      set_table_name "sales"
-      belongs_to :time_by_day
-      belongs_to :product
-      belongs_to :customer
     end
   end
 
   desc "Create test data"
-  task :create_data => [:create_tables, :create_time_data, :create_product_data, :create_customer_data, :create_sales_data]
+  task :create_data => [:create_tables, :setup_luciddb, :create_time_data, :create_product_data, :create_customer_data, :create_sales_data]
 
   task :create_time_data  => :define_models do
     puts "==> Creating time dimension"
-    TimeDimension.delete_all
-    start_time = Time.local(2010,1,1)
-    (2*365).times do |i|
-      TimeDimension.create!(:the_date => start_time + i.day)
+    if MONDRIAN_DRIVER == 'luciddb'
+      ActiveRecord::Base.connection.execute 'truncate table "TIME"'
+      ActiveRecord::Base.connection.execute 'insert into "TIME" select * from mondrian_test_source."time"'
+      ActiveRecord::Base.connection.execute 'analyze table "TIME" compute statistics for all columns'
+    else
+      TimeDimension.delete_all
+      start_time = Time.local(2010,1,1)
+      (2*365).times do |i|
+        TimeDimension.create!(:the_date => start_time + i.day)
+      end
     end
   end
 
   task :create_product_data => :define_models do
     puts "==> Creating product data"
-    Product.delete_all
-    ProductClass.delete_all
-    families = ["Drink", "Food", "Non-Consumable"]
-    (1..100).each do |i|
-      product_class = ProductClass.create!(
-        :product_family => families[i % 3],
-        :product_department => "Department #{i}",
-        :product_category => "Category #{i}",
-        :product_subcategory => "Subcategory #{i}"
-      )
-      Product.create!(
-        :product_class_id => product_class.id,
-        :brand_name => "Brand #{i}",
-        :product_name => "Product #{i}"
-      )
+    if MONDRIAN_DRIVER == 'luciddb'
+      ActiveRecord::Base.connection.execute 'truncate table product_classes'
+      ActiveRecord::Base.connection.execute 'truncate table products'
+      ActiveRecord::Base.connection.execute 'insert into product_classes select * from mondrian_test_source."product_classes"'
+      ActiveRecord::Base.connection.execute 'insert into products select * from mondrian_test_source."products"'
+      ActiveRecord::Base.connection.execute 'analyze table product_classes compute statistics for all columns'
+      ActiveRecord::Base.connection.execute 'analyze table products compute statistics for all columns'
+    else
+      Product.delete_all
+      ProductClass.delete_all
+      families = ["Drink", "Food", "Non-Consumable"]
+      (1..100).each do |i|
+        product_class = ProductClass.create!(
+          :product_family => families[i % 3],
+          :product_department => "Department #{i}",
+          :product_category => "Category #{i}",
+          :product_subcategory => "Subcategory #{i}"
+        )
+        Product.create!(
+          # LucidDB is not returning inserted ID therefore doing it hard way
+          :product_class_id => ProductClass.find_all_by_product_category("Category #{i}").first.id,
+          :brand_name => "Brand #{i}",
+          :product_name => "Product #{i}"
+        )
+      end
     end
   end
 
   task :create_customer_data => :define_models do
     puts "==> Creating customer data"
-    Customer.delete_all
-    i = 0
-    [
-      ["Canada", "BC", "Burnaby"],["Canada", "BC", "Cliffside"],["Canada", "BC", "Haney"],["Canada", "BC", "Ladner"],
-      ["Canada", "BC", "Langford"],["Canada", "BC", "Langley"],["Canada", "BC", "Metchosin"],["Canada", "BC", "N. Vancouver"],
-      ["Canada", "BC", "Newton"],["Canada", "BC", "Oak Bay"],["Canada", "BC", "Port Hammond"],["Canada", "BC", "Richmond"],
-      ["Canada", "BC", "Royal Oak"],["Canada", "BC", "Shawnee"],["Canada", "BC", "Sooke"],["Canada", "BC", "Vancouver"],
-      ["Canada", "BC", "Victoria"],["Canada", "BC", "Westminster"],
-      ["Mexico", "DF", "San Andres"],["Mexico", "DF", "Santa Anita"],["Mexico", "DF", "Santa Fe"],["Mexico", "DF", "Tixapan"],
-      ["Mexico", "Guerrero", "Acapulco"],["Mexico", "Jalisco", "Guadalajara"],["Mexico", "Mexico", "Mexico City"],
-      ["Mexico", "Oaxaca", "Tlaxiaco"],["Mexico", "Sinaloa", "La Cruz"],["Mexico", "Veracruz", "Orizaba"],
-      ["Mexico", "Yucatan", "Merida"],["Mexico", "Zacatecas", "Camacho"],["Mexico", "Zacatecas", "Hidalgo"],
-      ["USA", "CA", "Altadena"],["USA", "CA", "Arcadia"],["USA", "CA", "Bellflower"],["USA", "CA", "Berkeley"],
-      ["USA", "CA", "Beverly Hills"],["USA", "CA", "Burbank"],["USA", "CA", "Burlingame"],["USA", "CA", "Chula Vista"],
-      ["USA", "CA", "Colma"],["USA", "CA", "Concord"],["USA", "CA", "Coronado"],["USA", "CA", "Daly City"],
-      ["USA", "CA", "Downey"],["USA", "CA", "El Cajon"],["USA", "CA", "Fremont"],["USA", "CA", "Glendale"],
-      ["USA", "CA", "Grossmont"],["USA", "CA", "Imperial Beach"],["USA", "CA", "La Jolla"],["USA", "CA", "La Mesa"],
-      ["USA", "CA", "Lakewood"],["USA", "CA", "Lemon Grove"],["USA", "CA", "Lincoln Acres"],["USA", "CA", "Long Beach"],
-      ["USA", "CA", "Los Angeles"],["USA", "CA", "Mill Valley"],["USA", "CA", "National City"],["USA", "CA", "Newport Beach"],
-      ["USA", "CA", "Novato"],["USA", "CA", "Oakland"],["USA", "CA", "Palo Alto"],["USA", "CA", "Pomona"],
-      ["USA", "CA", "Redwood City"],["USA", "CA", "Richmond"],["USA", "CA", "San Carlos"],["USA", "CA", "San Diego"],
-      ["USA", "CA", "San Francisco"],["USA", "CA", "San Gabriel"],["USA", "CA", "San Jose"],["USA", "CA", "Santa Cruz"],
-      ["USA", "CA", "Santa Monica"],["USA", "CA", "Spring Valley"],["USA", "CA", "Torrance"],["USA", "CA", "West Covina"],
-      ["USA", "CA", "Woodland Hills"],
-      ["USA", "OR", "Albany"],["USA", "OR", "Beaverton"],["USA", "OR", "Corvallis"],["USA", "OR", "Lake Oswego"],
-      ["USA", "OR", "Lebanon"],["USA", "OR", "Milwaukie"],["USA", "OR", "Oregon City"],["USA", "OR", "Portland"],
-      ["USA", "OR", "Salem"],["USA", "OR", "W. Linn"],["USA", "OR", "Woodburn"],
-      ["USA", "WA", "Anacortes"],["USA", "WA", "Ballard"],["USA", "WA", "Bellingham"],["USA", "WA", "Bremerton"],
-      ["USA", "WA", "Burien"],["USA", "WA", "Edmonds"],["USA", "WA", "Everett"],["USA", "WA", "Issaquah"],
-      ["USA", "WA", "Kirkland"],["USA", "WA", "Lynnwood"],["USA", "WA", "Marysville"],["USA", "WA", "Olympia"],
-      ["USA", "WA", "Port Orchard"],["USA", "WA", "Puyallup"],["USA", "WA", "Redmond"],["USA", "WA", "Renton"],
-      ["USA", "WA", "Seattle"],["USA", "WA", "Sedro Woolley"],["USA", "WA", "Spokane"],["USA", "WA", "Tacoma"],
-      ["USA", "WA", "Walla Walla"],["USA", "WA", "Yakima"]
-    ].each do |country, state, city|
-      i += 1
-      Customer.create!(
-        :country => country,
-        :state_province => state,
-        :city => city,
-        :fname => "First#{i}",
-        :lname => "Last#{i}",
-        :fullname => "First#{i} Last#{i}",
-        :gender => i % 2 == 0 ? "M" : "F"
-      )
+    if MONDRIAN_DRIVER == 'luciddb'
+      ActiveRecord::Base.connection.execute 'truncate table customers'
+      ActiveRecord::Base.connection.execute 'insert into customers select * from mondrian_test_source."customers"'
+      ActiveRecord::Base.connection.execute 'analyze table customers compute statistics for all columns'
+    else
+      Customer.delete_all
+      i = 0
+      [
+        ["Canada", "BC", "Burnaby"],["Canada", "BC", "Cliffside"],["Canada", "BC", "Haney"],["Canada", "BC", "Ladner"],
+        ["Canada", "BC", "Langford"],["Canada", "BC", "Langley"],["Canada", "BC", "Metchosin"],["Canada", "BC", "N. Vancouver"],
+        ["Canada", "BC", "Newton"],["Canada", "BC", "Oak Bay"],["Canada", "BC", "Port Hammond"],["Canada", "BC", "Richmond"],
+        ["Canada", "BC", "Royal Oak"],["Canada", "BC", "Shawnee"],["Canada", "BC", "Sooke"],["Canada", "BC", "Vancouver"],
+        ["Canada", "BC", "Victoria"],["Canada", "BC", "Westminster"],
+        ["Mexico", "DF", "San Andres"],["Mexico", "DF", "Santa Anita"],["Mexico", "DF", "Santa Fe"],["Mexico", "DF", "Tixapan"],
+        ["Mexico", "Guerrero", "Acapulco"],["Mexico", "Jalisco", "Guadalajara"],["Mexico", "Mexico", "Mexico City"],
+        ["Mexico", "Oaxaca", "Tlaxiaco"],["Mexico", "Sinaloa", "La Cruz"],["Mexico", "Veracruz", "Orizaba"],
+        ["Mexico", "Yucatan", "Merida"],["Mexico", "Zacatecas", "Camacho"],["Mexico", "Zacatecas", "Hidalgo"],
+        ["USA", "CA", "Altadena"],["USA", "CA", "Arcadia"],["USA", "CA", "Bellflower"],["USA", "CA", "Berkeley"],
+        ["USA", "CA", "Beverly Hills"],["USA", "CA", "Burbank"],["USA", "CA", "Burlingame"],["USA", "CA", "Chula Vista"],
+        ["USA", "CA", "Colma"],["USA", "CA", "Concord"],["USA", "CA", "Coronado"],["USA", "CA", "Daly City"],
+        ["USA", "CA", "Downey"],["USA", "CA", "El Cajon"],["USA", "CA", "Fremont"],["USA", "CA", "Glendale"],
+        ["USA", "CA", "Grossmont"],["USA", "CA", "Imperial Beach"],["USA", "CA", "La Jolla"],["USA", "CA", "La Mesa"],
+        ["USA", "CA", "Lakewood"],["USA", "CA", "Lemon Grove"],["USA", "CA", "Lincoln Acres"],["USA", "CA", "Long Beach"],
+        ["USA", "CA", "Los Angeles"],["USA", "CA", "Mill Valley"],["USA", "CA", "National City"],["USA", "CA", "Newport Beach"],
+        ["USA", "CA", "Novato"],["USA", "CA", "Oakland"],["USA", "CA", "Palo Alto"],["USA", "CA", "Pomona"],
+        ["USA", "CA", "Redwood City"],["USA", "CA", "Richmond"],["USA", "CA", "San Carlos"],["USA", "CA", "San Diego"],
+        ["USA", "CA", "San Francisco"],["USA", "CA", "San Gabriel"],["USA", "CA", "San Jose"],["USA", "CA", "Santa Cruz"],
+        ["USA", "CA", "Santa Monica"],["USA", "CA", "Spring Valley"],["USA", "CA", "Torrance"],["USA", "CA", "West Covina"],
+        ["USA", "CA", "Woodland Hills"],
+        ["USA", "OR", "Albany"],["USA", "OR", "Beaverton"],["USA", "OR", "Corvallis"],["USA", "OR", "Lake Oswego"],
+        ["USA", "OR", "Lebanon"],["USA", "OR", "Milwaukie"],["USA", "OR", "Oregon City"],["USA", "OR", "Portland"],
+        ["USA", "OR", "Salem"],["USA", "OR", "W. Linn"],["USA", "OR", "Woodburn"],
+        ["USA", "WA", "Anacortes"],["USA", "WA", "Ballard"],["USA", "WA", "Bellingham"],["USA", "WA", "Bremerton"],
+        ["USA", "WA", "Burien"],["USA", "WA", "Edmonds"],["USA", "WA", "Everett"],["USA", "WA", "Issaquah"],
+        ["USA", "WA", "Kirkland"],["USA", "WA", "Lynnwood"],["USA", "WA", "Marysville"],["USA", "WA", "Olympia"],
+        ["USA", "WA", "Port Orchard"],["USA", "WA", "Puyallup"],["USA", "WA", "Redmond"],["USA", "WA", "Renton"],
+        ["USA", "WA", "Seattle"],["USA", "WA", "Sedro Woolley"],["USA", "WA", "Spokane"],["USA", "WA", "Tacoma"],
+        ["USA", "WA", "Walla Walla"],["USA", "WA", "Yakima"]
+      ].each do |country, state, city|
+        i += 1
+        Customer.create!(
+          :country => country,
+          :state_province => state,
+          :city => city,
+          :fname => "First#{i}",
+          :lname => "Last#{i}",
+          :fullname => "First#{i} Last#{i}",
+          :gender => i % 2 == 0 ? "M" : "F"
+        )
+      end
     end
   end
 
   task :create_sales_data => :define_models do
     puts "==> Creating sales data"
-    Sales.delete_all
-    count = 100
-    products = Product.order("id").limit(count).all
-    times = TimeDimension.order("id").limit(count).all
-    customers = Customer.order("id").limit(count).all
-    count.times do |i|
-      Sales.create!(
-        :product_id => products[i].id,
-        :time_id => times[i].id,
-        :customer_id => customers[i].id,
-        :store_sales => BigDecimal("2#{i}.12"),
-        :store_cost => BigDecimal("1#{i}.1234"),
-        :unit_sales => i+1
-      )
+    if MONDRIAN_DRIVER == 'luciddb'
+      ActiveRecord::Base.connection.execute 'truncate table sales'
+      ActiveRecord::Base.connection.execute 'insert into sales select * from mondrian_test_source."sales"'
+      ActiveRecord::Base.connection.execute 'analyze table sales compute statistics for all columns'
+    else
+      Sales.delete_all
+      count = 100
+      # LucidDB does not support LIMIT therefore select all and limit in Ruby
+      products = Product.order("id").all[0...count]
+      times = TimeDimension.order("id").all[0...count]
+      customers = Customer.order("id").all[0...count]
+      count.times do |i|
+        Sales.create!(
+          :product_id => products[i].id,
+          :time_id => times[i].id,
+          :customer_id => customers[i].id,
+          :store_sales => BigDecimal("2#{i}.12"),
+          :store_cost => BigDecimal("1#{i}.1234"),
+          :unit_sales => i+1
+        )
+      end
     end
   end
 
 end
+
+namespace :spec do
+  %w(mysql postgresql oracle luciddb).each do |driver|
+    desc "Run specs with #{driver} driver"
+    task driver do
+      ENV['MONDRIAN_DRIVER'] = driver
+      Rake::Task['spec'].reenable
+      Rake::Task['spec'].invoke
+    end
+  end
+
+  desc "Run specs with all database drivers"
+  task :all do
+    %w(mysql postgresql oracle luciddb).each do |driver|
+      Rake::Task["spec:#{driver}"].invoke
+    end
+  end
+end

data/spec/schema_definition_spec.rb

@@ -83,21 +83,57 @@ describe "Schema definition" do
         XML
       end
 
-      it "should render table name in uppercase when using Oracle driver" do
+      it "should render table name in uppercase when using Oracle or LucidDB driver" do
         @schema.define do
           cube 'Sales' do
-            table 'sales_fact', :alias => 'sales'
+            table 'sales_fact', :alias => 'sales', :schema => 'facts'
           end
         end
-        @schema.to_xml(:driver => 'oracle').should be_like <<-XML
+        %w(oracle luciddb).each do |driver|
+          @schema.to_xml(:driver => driver).should be_like <<-XML
+          <?xml version="1.0"?>
+          <Schema name="default">
+            <Cube name="Sales">
+              <Table alias="SALES" name="SALES_FACT" schema="FACTS"/>
+            </Cube>
+          </Schema>
+          XML
+        end
+      end
+
+      it "should render table name in uppercase when :upcase_data_dictionary option is set to true" do
+        @schema.define :upcase_data_dictionary => true do
+          cube 'Sales' do
+            table 'sales_fact', :alias => 'sales', :schema => 'facts'
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
         <?xml version="1.0"?>
         <Schema name="default">
           <Cube name="Sales">
-            <Table alias="SALES" name="SALES_FACT"/>
+            <Table alias="SALES" name="SALES_FACT" schema="FACTS"/>
           </Cube>
         </Schema>
         XML
       end
+
+      it "should render table name in lowercase when using Oracle or LucidDB driver but with :upcase_data_dictionary set to false" do
+        @schema.define :upcase_data_dictionary => false do
+          cube 'Sales' do
+            table 'sales_fact', :alias => 'sales', :schema => 'facts'
+          end
+        end
+        %w(oracle luciddb).each do |driver|
+          @schema.to_xml(:driver => driver).should be_like <<-XML
+          <?xml version="1.0"?>
+          <Schema name="default">
+            <Cube name="Sales">
+              <Table alias="sales" name="sales_fact" schema="facts"/>
+            </Cube>
+          </Schema>
+          XML
+        end
+      end
     end
 
     describe "Dimension" do
@@ -287,6 +323,7 @@ describe "Schema definition" do
             calculated_member 'Profit' do
               dimension 'Measures'
               formula '[Measures].[Store Sales] - [Measures].[Store Cost]'
+              format_string '#,##0.00'
             end
           end
         end
@@ -294,7 +331,9 @@ describe "Schema definition" do
         <?xml version="1.0"?>
         <Schema name="default">
           <Cube name="Sales">
-            <CalculatedMember dimension="Measures" formula="[Measures].[Store Sales] - [Measures].[Store Cost]" name="Profit"/>
+            <CalculatedMember dimension="Measures" formatString="#,##0.00" name="Profit">
+              <Formula>[Measures].[Store Sales] - [Measures].[Store Cost]</Formula>
+            </CalculatedMember>
           </Cube>
         </Schema>
         XML

data/spec/spec_helper.rb

@@ -23,6 +23,34 @@ when 'postgresql'
 when 'oracle'
   require 'active_record/connection_adapters/oracle_enhanced_adapter'
   DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
+when 'luciddb'
+  require 'jdbc/luciddb'
+
+  # Hack to disable :text type for LucidDB
+  require 'arjdbc/jdbc/type_converter'
+  ActiveRecord::ConnectionAdapters::JdbcTypeConverter::AR_TO_JDBC_TYPES.delete(:text)
+
+  # patches for LucidDB minimal AR support
+  require 'arjdbc/jdbc/adapter'
+  ActiveRecord::ConnectionAdapters::JdbcAdapter.class_eval do
+    def modify_types(tp)
+      # mapping of ActiveRecord data types to LucidDB data types
+      # data will be imported into LucidDB therefore primary key is defined as simple integer field
+      tp[:primary_key] = "INT"
+      tp[:integer] = "INT"
+    end
+    # by default LucidDB stores table and column names in uppercase
+    def quote_table_name(name)
+      "\"#{name.to_s.upcase}\""
+    end
+    def quote_column_name(name)
+      "\"#{name.to_s.upcase}\""
+    end
+  end
+  JDBC_DRIVER = 'org.luciddb.jdbc.LucidDbClientDriver'
+  DATABASE_USER.upcase! if DATABASE_USER == 'mondrian_test'
+  DATABASE_NAME = nil
+  DATABASE_SCHEMA = ENV['DATABASE_SCHEMA'] || 'mondrian_test'
 end
 
 puts "==> Using #{MONDRIAN_DRIVER} driver"
@@ -52,6 +80,17 @@ if MONDRIAN_DRIVER == 'oracle'
     :username => CONNECTION_PARAMS[:username],
     :password => CONNECTION_PARAMS[:password]
   }
+elsif MONDRIAN_DRIVER == 'luciddb'
+  CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
+  CONNECTION_PARAMS[:database] = nil
+  CONNECTION_PARAMS[:database_schema] = DATABASE_SCHEMA
+  AR_CONNECTION_PARAMS = {
+    :adapter => 'jdbc',
+    :driver => JDBC_DRIVER,
+    :url => "jdbc:#{MONDRIAN_DRIVER}:http://#{CONNECTION_PARAMS[:host]};schema=#{CONNECTION_PARAMS[:database_schema]}",
+    :username => CONNECTION_PARAMS[:username],
+    :password => CONNECTION_PARAMS[:password]
+  }
 else
   CATALOG_FILE = File.expand_path('../fixtures/MondrianTest.xml', __FILE__)
   AR_CONNECTION_PARAMS = {

metadata

@@ -2,7 +2,7 @@
 name: mondrian-olap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
   - Raimonds Simanovskis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +02:00
+date: 2011-07-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -47,29 +47,29 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: rdoc
     version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: "2.5"
+            version: "0"
     requirement: *id004
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: autotest
+    name: rspec
     version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: "2.5"
     requirement: *id005
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: jdbc-mysql
+    name: autotest
     version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -80,7 +80,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: jdbc-postgres
+    name: jdbc-mysql
     version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -91,18 +91,18 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord
+    name: jdbc-postgres
     version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 3.0.5
+            version: "0"
     requirement: *id008
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord-jdbc-adapter
+    name: jdbc-luciddb
     version_requirements: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -113,14 +113,36 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord-oracle_enhanced-adapter
+    name: activerecord
     version_requirements: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 3.0.5
+    requirement: *id010
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: activerecord-jdbc-adapter
+    version_requirements: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id010
+    requirement: *id011
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: activerecord-oracle_enhanced-adapter
+    version_requirements: &id012 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id012
     prerelease: false
     type: :development
 description: |
@@ -137,6 +159,7 @@ extra_rdoc_files:
   - README.rdoc
 files: 
   - .rspec
+  - Changelog.md
   - Gemfile
   - LICENSE-Mondrian.html
   - LICENSE.txt