mondrian-olap 0.2.0 → 0.3.0

data/Changelog.md

@@ -1,3 +1,23 @@
+### 0.3.0 / 2011-11-12
+
+* New features
+  * upgraded to Mondrian 3.3.0 version (latest shapshot with additional bug fixes)
+    as well as corresponding olap4j 1.0.0 version
+  * support for SQL Server (jTDS and Microsoft drivers)
+  * aggregates definition in schema
+  * possibility to include XML fragments in schema
+    (e.g. to paste XML for aggregates that is generated by Mondrian aggregation designer)
+  * define level properties in schema
+  * `sql` element for `table` element in schema
+    (to define custom WHERE conditions for dimensions or fact table)
+  * `view` element in schema
+    (to define custom SQL SELECT statements instead of existing table)
+  * `measure_expression` element in schema
+    (to define custom SQL expression for measure instead of fact column)
+  * allow crossjoin of where conditions as well as where with several same dimension members
+* Improvements
+  * use latest Nokogiri 1.5.0 version
+
 ### 0.2.0 / 2011-07-01
 
 * New features

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'nokogiri', '~> 1.5.0.beta.4'
+gem 'nokogiri', '~> 1.5.0'
 
 group :development do
   gem 'jruby-openssl'
@@ -11,7 +11,8 @@ group :development do
   gem 'jdbc-mysql'
   gem 'jdbc-postgres'
   gem 'jdbc-luciddb'
-  gem 'activerecord', '~> 3.0.5'
-  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-jtds'
+  gem 'activerecord', '= 3.0.10'
+  gem 'activerecord-jdbc-adapter', '= 1.1.1'
   gem 'activerecord-oracle_enhanced-adapter', :require => false
 end

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2010 Raimonds Simanovskis
+Copyright (c) 2010-2011 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.rdoc

@@ -195,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, 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.
+mondrian-olap currently supports MySQL, PostgreSQL, Oracle, LucidDB and 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.
 
 == INSTALL
 

data/RUNNING_TESTS.rdoc

@@ -1,8 +1,8 @@
 == 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", "oracle" or "luciddb" to specify database driver that should be used.
+By default unit tests use MySQL database but PostgreSQL, Oracle and SQL Server databases are supported as well. Set MONDRIAN_DRIVER environment variable to "mysql" (default), "postgresql", "oracle", "luciddb", "mssql" (jTDS) or "sqlserver" (Microsoft JDBC) 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 MySQL, PostgreSQL or SQL Server 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).
 
@@ -20,11 +20,13 @@ Create tables with test data using
 
   rake db:create_data
 
-or specify which database driver to use
+or specify which database driver to use 
 
   rake db:create_data MONDRIAN_DRIVER=mysql
   rake db:create_data MONDRIAN_DRIVER=postgresql
   rake db:create_data MONDRIAN_DRIVER=oracle
+  rake db:create_data MONDRIAN_DRIVER=mssql 
+  rake db:create_data MONDRIAN_DRIVER=sqlserver
 
 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.
 
@@ -43,6 +45,8 @@ or specify which database driver to use
   rake spec MONDRIAN_DRIVER=postgresql
   rake spec MONDRIAN_DRIVER=oracle
   rake spec MONDRIAN_DRIVER=luciddb
+  rake spec MONDRIAN_DRIVER=mssql
+  rake spec MONDRIAN_DRIVER=sqlserver
 
 or also alternatively with
 
@@ -50,6 +54,8 @@ or also alternatively with
   rake spec:postgresql
   rake spec:oracle
   rake spec:luciddb
+  rake spec:mssql
+  rake spec:sqlserver
 
 You can also run all tests on all databases with
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/mondrian/olap/connection.rb

@@ -7,7 +7,7 @@ module Mondrian
         connection
       end
 
-      attr_reader :raw_connection, :raw_schema, :raw_schema_reader
+      attr_reader :raw_connection, :raw_catalog, :raw_schema
 
       def initialize(params={})
         @params = params
@@ -41,7 +41,9 @@ module Mondrian
         end
 
         @raw_connection = @raw_jdbc_connection.unwrap(Java::OrgOlap4j::OlapConnection.java_class)
-        @raw_schema = @raw_connection.getSchema
+        @raw_catalog = @raw_connection.getOlapCatalog
+        # currently it is assumed that there is just one schema per connection catalog
+        @raw_schema = @raw_catalog.getSchemas.first
         @connected = true
         true
       end
@@ -109,6 +111,19 @@ module Mondrian
           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
         else
           raise ArgumentError, 'unknown JDBC driver'
         end
@@ -124,6 +139,10 @@ module Mondrian
           'oracle.jdbc.OracleDriver'
         when 'luciddb'
           'org.luciddb.jdbc.LucidDbClientDriver'
+        when 'mssql'
+          'net.sourceforge.jtds.jdbc.Driver'
+        when 'sqlserver'
+          'com.microsoft.sqlserver.jdbc.SQLServerDriver'
         else
           raise ArgumentError, 'unknown JDBC driver'
         end

data/lib/mondrian/olap/cube.rb

@@ -33,14 +33,14 @@ module Mondrian
       end
 
       def member(full_name)
-        segment_names = Java::OrgOlap4jMdx::IdentifierNode.parseIdentifier(full_name).map do |segment|
-          segment.getName
-        end
-        member_by_segments(*segment_names)
+        segment_list = Java::OrgOlap4jMdx::IdentifierNode.parseIdentifier(full_name).getSegmentList
+        raw_member = @raw_cube.lookupMember(segment_list)
+        raw_member && Member.new(raw_member)
       end
 
       def member_by_segments(*segment_names)
-        raw_member = @raw_cube.lookupMember(*segment_names)
+        segment_list = Java::OrgOlap4jMdx::IdentifierNode.ofNames(*segment_names).getSegmentList
+        raw_member = @raw_cube.lookupMember(segment_list)
         raw_member && Member.new(raw_member)
       end
     end
@@ -197,6 +197,10 @@ module Mondrian
         @raw_member.isCalculated
       end
 
+      def all_member?
+        @raw_member.isAll
+      end
+
       def drillable?
         return false if calculated?
         # @raw_member.getChildMemberCount > 0
@@ -210,6 +214,17 @@ module Mondrian
         @raw_member.getDepth
       end
 
+      def dimension_type
+        case @raw_member.getDimension.getDimensionType
+        when Java::OrgOlap4jMetadata::Dimension::Type::TIME
+          :time
+        when Java::OrgOlap4jMetadata::Dimension::Type::MEASURE
+          :measures
+        else
+          :standard
+        end
+      end
+
       def children
         @raw_member.getChildMembers.map{|m| Member.new(m)}
       end

data/lib/mondrian/olap/query.rb

@@ -139,6 +139,7 @@ module Mondrian
         if members.empty?
           @where
         else
+          @current_set = @where
           if members.length == 1 && members[0].is_a?(Array)
             @where.concat(members[0])
           else
@@ -289,6 +290,17 @@ module Mondrian
       end
 
       def where_to_mdx
+        # generate set MDX expression
+        if @where[0].is_a?(Symbol) ||
+            @where.length > 1 && @where.map{|full_name| extract_dimension_name(full_name)}.uniq.length == 1
+          members_to_mdx(@where)
+        # generate tupple MDX expression
+        else
+          where_to_mdx_tupple
+        end
+      end
+
+      def where_to_mdx_tupple
         mdx = '('
         mdx << @where.map do |condition|
           condition
@@ -308,6 +320,12 @@ module Mondrian
           "#{value}"
         end
       end
+
+      def extract_dimension_name(full_name)
+        if full_name =~ /\A\[([^\]]+)\]/
+          $1
+        end
+      end
     end
   end
 end

data/lib/mondrian/olap/schema.rb

@@ -55,7 +55,7 @@ module Mondrian
           :cache,
           # Whether element is enabled - if true, then the Cube is realized otherwise it is ignored.
           :enabled
-        elements :table, :dimension, :measure, :calculated_member
+        elements :table, :view, :dimension, :measure, :calculated_member
       end
 
       class Table < SchemaElement
@@ -65,6 +65,13 @@ module Mondrian
           # (You can use the same table in different hierarchies, but it must have different aliases.)
           :alias
         data_dictionary_names :name, :schema, :alias # values in XML will be uppercased when using Oracle driver
+        elements :agg_exclude, :agg_name, :agg_pattern, :sql
+      end
+
+      class View < SchemaElement
+        attributes :alias
+        # Defines a "table" using SQL query which can have different variants for different underlying databases
+        elements :sql
       end
 
       class Dimension < SchemaElement
@@ -101,7 +108,7 @@ module Mondrian
           # that all members have entirely unique rows, allowing SQL GROUP BY clauses to be completely eliminated from the query.
           :unique_key_level_name
         data_dictionary_names :primary_key, :primary_key_table # values in XML will be uppercased when using Oracle driver
-        elements :table, :join, :level
+        elements :table, :join, :property, :level
       end
 
       class Join < SchemaElement
@@ -156,7 +163,7 @@ 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
+        elements :key_expression, :name_expression, :ordinal_expression, :property
       end
 
       class KeyExpression < SchemaElement
@@ -179,6 +186,18 @@ module Mondrian
         content :text
       end
 
+      class Property < SchemaElement
+        attributes :name, :description,
+          :column,
+          # Data type of this property: String, Numeric, Integer, Boolean, Date, Time or Timestamp.
+          :type,
+          # Should be set to true if the value of the property is functionally dependent on the level value.
+          # This permits the associated property column to be omitted from the GROUP BY clause
+          # (if the database permits columns in the SELECT that are not in the GROUP BY).
+          # This can be a significant performance enhancement on some databases, such as MySQL.
+          :depends_on_level_value
+      end
+
       class Measure < SchemaElement
         attributes :name, :description,
           # Column which is source of this measure's values.
@@ -192,6 +211,11 @@ module Mondrian
           # Format string with which to format cells of this measure. For more details, see the mondrian.util.Format class.
           :format_string
         data_dictionary_names :column # values in XML will be uppercased when using Oracle driver
+        elements :measure_expression
+      end
+
+      class MeasureExpression < SchemaElement
+        elements :sql
       end
 
       class CalculatedMember < SchemaElement
@@ -216,6 +240,48 @@ module Mondrian
           :value
       end
 
+      class AggName < SchemaElement
+        attributes :name
+        data_dictionary_names :name
+        elements :agg_fact_count, :agg_measure, :agg_level, :agg_foreign_key
+      end
+
+      class AggFactCount < SchemaElement
+        attributes :column
+        data_dictionary_names :column
+      end
+
+      class AggMeasure < SchemaElement
+        attributes :name, :column
+        data_dictionary_names :column
+      end
+
+      class AggLevel < SchemaElement
+        attributes :name, :column
+        data_dictionary_names :column
+      end
+
+      class AggForeignKey < SchemaElement
+        attributes :fact_column, :agg_column
+        data_dictionary_names :fact_column, :agg_column
+      end
+
+      class AggIgnoreColumn < SchemaElement
+        attributes :column
+        data_dictionary_names :column
+      end
+
+      class AggPattern < SchemaElement
+        attributes :pattern
+        data_dictionary_names :pattern
+        elements :agg_fact_count, :agg_measure, :agg_level, :agg_foreign_key, :agg_exclude
+      end
+
+      class AggExclude < SchemaElement
+        attributes :name, :pattern, :ignorecase
+        data_dictionary_names :name, :pattern
+      end
+
     end
   end
 end

data/lib/mondrian/olap/schema_element.rb

@@ -21,6 +21,7 @@ module Mondrian
         self.class.elements.each do |element|
           instance_variable_set("@#{pluralize(element)}", [])
         end
+        @xml_fragments = []
         instance_eval &block if block
       end
 
@@ -67,6 +68,14 @@ module Mondrian
         @content = type
       end
 
+      attr_reader :xml_fragments
+      def xml(string)
+        string = string.strip
+        fragment = Nokogiri::XML::DocumentFragment.parse(string)
+        raise ArgumentError, "Invalid XML fragment:\n#{string}" if fragment.children.empty?
+        @xml_fragments << string
+      end
+
       def to_xml(options={})
         options[:upcase_data_dictionary] = @upcase_data_dictionary unless @upcase_data_dictionary.nil?
         Nokogiri::XML::Builder.new do |xml|
@@ -84,6 +93,9 @@ module Mondrian
             self.class.elements.each do |element|
               instance_variable_get("@#{pluralize(element)}").each {|item| item.add_to_xml(xml, options)}
             end
+            @xml_fragments.each do |xml_fragment|
+              xml.send(:insert, Nokogiri::XML::DocumentFragment.parse(xml_fragment))
+            end
           end
         end
       end

data/mondrian-olap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mondrian-olap}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Raimonds Simanovskis"]
-  s.date = %q{2011-07-01}
+  s.authors = [%q{Raimonds Simanovskis}]
+  s.date = %q{2011-11-12}
   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}
@@ -62,8 +62,8 @@ Gem::Specification.new do |s|
     "spec/support/matchers/be_like.rb"
   ]
   s.homepage = %q{http://github.com/rsim/mondrian-olap}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.1}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{JRuby API for Mondrian OLAP Java library}
   s.test_files = [
     "spec/connection_spec.rb",
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
@@ -88,11 +88,12 @@ Gem::Specification.new do |s|
       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<jdbc-jtds>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, ["= 3.0.10"])
+      s.add_development_dependency(%q<activerecord-jdbc-adapter>, ["= 1.1.1"])
       s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])
     else
-      s.add_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rdoc>, [">= 0"])
@@ -101,12 +102,13 @@ Gem::Specification.new do |s|
       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<jdbc-jtds>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["= 3.0.10"])
+      s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.1.1"])
       s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, ["~> 1.5.0.beta.4"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rdoc>, [">= 0"])
@@ -115,8 +117,9 @@ Gem::Specification.new do |s|
     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<jdbc-jtds>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["= 3.0.10"])
+    s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.1.1"])
     s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 0"])
   end
 end

data/spec/cube_spec.rb

@@ -254,6 +254,26 @@ describe "Cube" do
       @cube.member('[Customers].[USA]').should_not be_calculated
     end
 
+    it "should be all member when member is all member" do
+      @cube.member('[Customers].[All Customers]').should be_all_member
+    end
+
+    it "should not be all member when member is not all member" do
+      @cube.member('[Customers].[USA]').should_not be_all_member
+    end
+
+    it "should get dimension type of standard dimension member" do
+      @cube.member('[Customers].[USA]').dimension_type.should == :standard
+    end
+
+    it "should get dimension type of measure" do
+      @cube.member('[Measures].[Unit Sales]').dimension_type.should == :measures
+    end
+
+    it "should get dimension type of time dimension member" do
+      @cube.member('[Time].[2011]').dimension_type.should == :time
+    end
+
   end
 
 end

data/spec/query_spec.rb

@@ -278,6 +278,11 @@ describe "Query" do
         @query.where('[Time].[2010].[Q1]').where('[Customers].[USA].[CA]')
         @query.where.should == ['[Time].[2010].[Q1]', '[Customers].[USA].[CA]']
       end
+
+      it "should do crossjoin of where conditions" do
+        @query.where('[Customers].[USA]').crossjoin('[Time].[2011].[Q1]', '[Time].[2011].[Q2]')
+        @query.where.should == [:crossjoin, ['[Customers].[USA]'], ['[Time].[2011].[Q1]', '[Time].[2011].[Q2]']]
+      end
     end
 
     describe "with member" do
@@ -375,6 +380,30 @@ describe "Query" do
           SQL
       end
 
+      it "should return query with where with several same dimension members" do
+        @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
+          rows('[Product].children').
+          where('[Customers].[Canada]', '[Customers].[USA]').
+          to_mdx.should be_like <<-SQL
+            SELECT  {[Measures].[Unit Sales], [Measures].[Store Sales]} ON COLUMNS,
+                    [Product].children ON ROWS
+              FROM  [Sales]
+              WHERE {[Customers].[Canada], [Customers].[USA]}
+          SQL
+      end
+
+      it "should return query with where with crossjoin" do
+        @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
+          rows('[Product].children').
+          where('[Customers].[USA]').crossjoin('[Time].[2011].[Q1]', '[Time].[2011].[Q2]').
+          to_mdx.should be_like <<-SQL
+            SELECT  {[Measures].[Unit Sales], [Measures].[Store Sales]} ON COLUMNS,
+                    [Product].children ON ROWS
+              FROM  [Sales]
+              WHERE CROSSJOIN([Customers].[USA], {[Time].[2011].[Q1], [Time].[2011].[Q2]})
+          SQL
+      end
+
       it "should return query with order by one measure" do
         @query.columns('[Measures].[Unit Sales]', '[Measures].[Store Sales]').
           rows('[Product].children').order('[Measures].[Unit Sales]', :bdesc).

data/spec/rake_tasks.rb

@@ -242,7 +242,7 @@ namespace :db do
 end
 
 namespace :spec do
-  %w(mysql postgresql oracle luciddb).each do |driver|
+  %w(mysql postgresql oracle luciddb mssql sqlserver).each do |driver|
     desc "Run specs with #{driver} driver"
     task driver do
       ENV['MONDRIAN_DRIVER'] = driver
@@ -253,7 +253,7 @@ namespace :spec do
 
   desc "Run specs with all database drivers"
   task :all do
-    %w(mysql postgresql oracle luciddb).each do |driver|
+    %w(mysql postgresql oracle luciddb mssql sqlserver).each do |driver|
       Rake::Task["spec:#{driver}"].invoke
     end
   end

data/spec/schema_definition_spec.rb

@@ -134,6 +134,48 @@ describe "Schema definition" do
           XML
         end
       end
+
+      it "should render table with where condition" do
+        @schema.define do
+          cube 'Sales' do
+            table 'sales_fact', :alias => 'sales' do
+              sql 'customer_id IS NOT NULL'
+            end
+          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">
+              <SQL>customer_id IS NOT NULL</SQL>
+            </Table>
+          </Cube>
+        </Schema>
+        XML
+      end
+    end
+
+    describe "View" do
+      it "should render to XML" do
+        @schema.define do
+          cube 'Sales' do
+            view :alias => 'sales' do
+              sql 'select * from sales_fact'
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <View alias="sales">
+              <SQL>select * from sales_fact</SQL>
+            </View>
+          </Cube>
+        </Schema>
+        XML
+      end
     end
 
     describe "Dimension" do
@@ -314,6 +356,30 @@ describe "Schema definition" do
         </Schema>
         XML
       end
+
+      it "should render with measure expression" do
+        @schema.define do
+          cube 'Sales' do
+            measure 'Double Unit Sales', :aggregator => 'sum' do
+              measure_expression do
+                sql 'unit_sales * 2'
+              end
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <Measure aggregator="sum" name="Double Unit Sales">
+              <MeasureExpression>
+                <SQL>unit_sales * 2</SQL>
+              </MeasureExpression>
+            </Measure>
+          </Cube>
+        </Schema>
+        XML
+      end
     end
 
     describe "Calculated Member" do
@@ -339,6 +405,195 @@ describe "Schema definition" do
         XML
       end
     end
+
+    describe "Aggregates" do
+      it "should render named aggregate to XML" do
+        @schema.define do
+          cube 'Sales' do
+            table 'sales_fact_1997' do
+              agg_name 'agg_c_special_sales_fact_1997' do
+                agg_fact_count :column => 'fact_count'
+                agg_measure '[Measures].[Store Cost]', :column => 'store_cost_sum'
+                agg_measure '[Measures].[Store Sales]', :column => 'store_sales_sum'
+                agg_level '[Product].[Product Family]', :column => 'product_family'
+                agg_level '[Time].[Quarter]', :column => 'time_quarter'
+                agg_level '[Time].[Year]', :column => 'time_year'
+                agg_level '[Time].[Quarter]', :column => 'time_quarter'
+                agg_level '[Time].[Month]', :column => 'time_month'
+              end
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <Table name="sales_fact_1997">
+              <AggName name="agg_c_special_sales_fact_1997">
+                <AggFactCount column="fact_count"/>
+                <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_year" name="[Time].[Year]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_month" name="[Time].[Month]"/>
+              </AggName>
+            </Table>
+          </Cube>
+        </Schema>
+        XML
+      end
+
+      it "should render aggregate pattern to XML" do
+        @schema.define do
+          cube 'Sales' do
+            table 'sales_fact_1997' do
+              agg_pattern :pattern => 'agg_.*_sales_fact_1997' do
+                agg_fact_count :column => 'fact_count'
+                agg_measure '[Measures].[Store Cost]', :column => 'store_cost_sum'
+                agg_measure '[Measures].[Store Sales]', :column => 'store_sales_sum'
+                agg_level '[Product].[Product Family]', :column => 'product_family'
+                agg_level '[Time].[Quarter]', :column => 'time_quarter'
+                agg_level '[Time].[Year]', :column => 'time_year'
+                agg_level '[Time].[Quarter]', :column => 'time_quarter'
+                agg_level '[Time].[Month]', :column => 'time_month'
+                agg_exclude 'agg_c_14_sales_fact_1997'
+                agg_exclude 'agg_lc_100_sales_fact_1997'
+              end
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <Table name="sales_fact_1997">
+              <AggPattern pattern="agg_.*_sales_fact_1997">
+                <AggFactCount column="fact_count"/>
+                <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_year" name="[Time].[Year]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_month" name="[Time].[Month]"/>
+                <AggExclude name="agg_c_14_sales_fact_1997"/>
+                <AggExclude name="agg_lc_100_sales_fact_1997"/>
+              </AggPattern>
+            </Table>
+          </Cube>
+        </Schema>
+        XML
+      end
+
+      it "should render embedded aggregate XML defintion to XML" do
+        @schema.define do
+          cube 'Sales' do
+            table 'sales_fact_1997' do
+              xml <<-XML
+                <AggName name="agg_c_special_sales_fact_1997">
+                  <AggFactCount column="fact_count"/>
+                  <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                  <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                  <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                  <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                  <AggLevel column="time_year" name="[Time].[Year]"/>
+                  <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                  <AggLevel column="time_month" name="[Time].[Month]"/>
+                </AggName>
+                <AggPattern pattern="agg_.*_sales_fact_1997">
+                  <AggFactCount column="fact_count"/>
+                  <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                  <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                  <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                  <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                  <AggLevel column="time_year" name="[Time].[Year]"/>
+                  <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                  <AggLevel column="time_month" name="[Time].[Month]"/>
+                  <AggExclude name="agg_c_14_sales_fact_1997"/>
+                  <AggExclude name="agg_lc_100_sales_fact_1997"/>
+                </AggPattern>
+              XML
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <Table name="sales_fact_1997">
+              <AggName name="agg_c_special_sales_fact_1997">
+                <AggFactCount column="fact_count"/>
+                <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_year" name="[Time].[Year]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_month" name="[Time].[Month]"/>
+              </AggName>
+              <AggPattern pattern="agg_.*_sales_fact_1997">
+                <AggFactCount column="fact_count"/>
+                <AggMeasure column="store_cost_sum" name="[Measures].[Store Cost]"/>
+                <AggMeasure column="store_sales_sum" name="[Measures].[Store Sales]"/>
+                <AggLevel column="product_family" name="[Product].[Product Family]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_year" name="[Time].[Year]"/>
+                <AggLevel column="time_quarter" name="[Time].[Quarter]"/>
+                <AggLevel column="time_month" name="[Time].[Month]"/>
+                <AggExclude name="agg_c_14_sales_fact_1997"/>
+                <AggExclude name="agg_lc_100_sales_fact_1997"/>
+              </AggPattern>
+            </Table>
+          </Cube>
+        </Schema>
+        XML
+      end
+
+    end
+
+    describe "Member properties" do
+      it "should render XML" do
+        @schema.define do
+          cube 'Sales' do
+            dimension 'Employees', :foreign_key => 'employee_id' do
+              hierarchy :has_all => true, :all_member_name => 'All Employees', :primary_key => 'employee_id' do
+                table 'employee'
+                level 'Employee Id', :unique_members => true, :type => 'Numeric', :column => 'employee_id', :name_column => 'full_name',
+                                      :parent_column => 'supervisor_id', :null_parent_value => 0 do
+                  property 'Marital Status', :column => 'marital_status'
+                  property 'Position Title', :column => 'position_title'
+                  property 'Gender', :column => 'gender'
+                  property 'Salary', :column => 'salary'
+                  property 'Education Level', :column => 'education_level'
+                end
+              end
+            end
+          end
+        end
+        @schema.to_xml.should be_like <<-XML
+        <?xml version="1.0"?>
+        <Schema name="default">
+          <Cube name="Sales">
+            <Dimension foreignKey="employee_id" name="Employees">
+              <Hierarchy allMemberName="All Employees" hasAll="true" primaryKey="employee_id">
+                <Table name="employee"/>
+                <Level column="employee_id" name="Employee Id" nameColumn="full_name" nullParentValue="0" parentColumn="supervisor_id" type="Numeric" uniqueMembers="true">
+                  <Property column="marital_status" name="Marital Status"/>
+                  <Property column="position_title" name="Position Title"/>
+                  <Property column="gender" name="Gender"/>
+                  <Property column="salary" name="Salary"/>
+                  <Property column="education_level" name="Education Level"/>
+                </Level>
+              </Hierarchy>
+            </Dimension>
+          </Cube>
+        </Schema>
+        XML
+      end
+    end
+
   end
 
   describe "connection with schema" do

data/spec/spec_helper.rb

@@ -7,25 +7,33 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'rspec'
 require 'active_record'
 
-DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
-DATABASE_USER = ENV['DATABASE_USER'] || 'mondrian_test'
+DATABASE_HOST     = ENV['DATABASE_HOST']     || 'localhost'
+DATABASE_USER     = ENV['DATABASE_USER']     || 'mondrian_test'
 DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'mondrian_test'
+DATABASE_NAME     = ENV['DATABASE_NAME']     || 'mondrian_test'
+DATABASE_INSTANCE = ENV['DATABASE_INSTANCE']
+MONDRIAN_DRIVER   = ENV['MONDRIAN_DRIVER']   || 'mysql'
 
-case MONDRIAN_DRIVER = ENV['MONDRIAN_DRIVER'] || 'mysql'
+case MONDRIAN_DRIVER
 when 'mysql'
   require 'jdbc/mysql'
   JDBC_DRIVER = 'com.mysql.jdbc.Driver'
-  DATABASE_NAME = ENV['DATABASE_NAME'] || 'mondrian_test'
 when 'postgresql'
   require 'jdbc/postgres'
   JDBC_DRIVER = 'org.postgresql.Driver'
-  DATABASE_NAME = ENV['DATABASE_NAME'] || 'mondrian_test'
 when 'oracle'
   require 'active_record/connection_adapters/oracle_enhanced_adapter'
   DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
+  CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
+when 'mssql'
+  require 'jdbc/jtds'
+  JDBC_DRIVER = 'net.sourceforge.jtds.jdbc.Driver'
+when 'sqlserver'
+  JDBC_DRIVER = 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
 when 'luciddb'
   require 'jdbc/luciddb'
-
+  CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
+  
   # Hack to disable :text type for LucidDB
   require 'arjdbc/jdbc/type_converter'
   ActiveRecord::ConnectionAdapters::JdbcTypeConverter::AR_TO_JDBC_TYPES.delete(:text)
@@ -56,51 +64,71 @@ end
 puts "==> Using #{MONDRIAN_DRIVER} driver"
 
 require 'mondrian/olap'
-
 require 'support/matchers/be_like'
 
 RSpec.configure do |config|
   config.include Matchers
 end
 
+CATALOG_FILE = File.expand_path('../fixtures/MondrianTest.xml', __FILE__) unless defined?(CATALOG_FILE)
+
 CONNECTION_PARAMS = {
-  :driver => MONDRIAN_DRIVER,
-  :host => DATABASE_HOST,
+  :driver   => MONDRIAN_DRIVER,
+  :host     => DATABASE_HOST,
   :database => DATABASE_NAME,
   :username => DATABASE_USER,
   :password => DATABASE_PASSWORD
 }
 
-if MONDRIAN_DRIVER == 'oracle'
-  CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
+case MONDRIAN_DRIVER 
+when 'oracle'
   AR_CONNECTION_PARAMS = {
-    :adapter => 'oracle_enhanced',
-    :host => CONNECTION_PARAMS[:host],
+    :adapter  => 'oracle_enhanced',
+    :host     => CONNECTION_PARAMS[:host],
     :database => CONNECTION_PARAMS[:database],
     :username => CONNECTION_PARAMS[:username],
     :password => CONNECTION_PARAMS[:password]
   }
-elsif MONDRIAN_DRIVER == 'luciddb'
-  CATALOG_FILE = File.expand_path('../fixtures/MondrianTestOracle.xml', __FILE__)
+when 'luciddb'
   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]}",
+    :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]
+  }
+when 'mssql'
+  url = "jdbc:jtds:sqlserver://#{CONNECTION_PARAMS[:host]}/#{CONNECTION_PARAMS[:database]}"
+  url << ";instance=#{DATABASE_INSTANCE}" if DATABASE_INSTANCE
+  AR_CONNECTION_PARAMS = {
+    :adapter  => 'jdbc',
+    :driver   => JDBC_DRIVER,
+    :url      => url,
+    :username => CONNECTION_PARAMS[:username],
+    :password => CONNECTION_PARAMS[:password]
+  }
+when 'sqlserver'
+  url = "jdbc:sqlserver://#{CONNECTION_PARAMS[:host]};databaseName=#{CONNECTION_PARAMS[:database]};"
+  url << ";instanceName=#{DATABASE_INSTANCE}" if DATABASE_INSTANCE
+  AR_CONNECTION_PARAMS = {
+    :adapter  => 'jdbc',
+    :driver   => JDBC_DRIVER,
+    :url      => url,
     :username => CONNECTION_PARAMS[:username],
     :password => CONNECTION_PARAMS[:password]
   }
 else
-  CATALOG_FILE = File.expand_path('../fixtures/MondrianTest.xml', __FILE__)
   AR_CONNECTION_PARAMS = {
-    :adapter => 'jdbc',
-    :driver => JDBC_DRIVER,
-    :url => "jdbc:#{MONDRIAN_DRIVER}://#{CONNECTION_PARAMS[:host]}/#{CONNECTION_PARAMS[:database]}",
+    :adapter  => 'jdbc',
+    :driver   => JDBC_DRIVER,
+    :url      => "jdbc:#{MONDRIAN_DRIVER}://#{CONNECTION_PARAMS[:host]}/#{CONNECTION_PARAMS[:database]}",
     :username => CONNECTION_PARAMS[:username],
     :password => CONNECTION_PARAMS[:password]
   }
 end
+
 CONNECTION_PARAMS_WITH_CATALOG = CONNECTION_PARAMS.merge(:catalog => CATALOG_FILE)
 
 ActiveRecord::Base.establish_connection(AR_CONNECTION_PARAMS)

metadata

@@ -2,7 +2,7 @@
 name: mondrian-olap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
   - Raimonds Simanovskis
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +03:00
-default_executable: 
+date: 2011-11-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: nokogiri
@@ -20,7 +19,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.5.0.beta.4
+            version: 1.5.0
     requirement: *id001
     prerelease: false
     type: :runtime
@@ -113,36 +112,47 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord
+    name: jdbc-jtds
     version_requirements: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 3.0.5
+            version: "0"
     requirement: *id010
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord-jdbc-adapter
+    name: activerecord
     version_requirements: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 3.0.10
     requirement: *id011
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: activerecord-oracle_enhanced-adapter
+    name: activerecord-jdbc-adapter
     version_requirements: &id012 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.1.1
+    requirement: *id012
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: activerecord-oracle_enhanced-adapter
+    version_requirements: &id013 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id012
+    requirement: *id013
     prerelease: false
     type: :development
 description: |
@@ -199,7 +209,6 @@ files:
   - spec/schema_definition_spec.rb
   - spec/spec_helper.rb
   - spec/support/matchers/be_like.rb
-has_rdoc: true
 homepage: http://github.com/rsim/mondrian-olap
 licenses: []
 
@@ -226,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: JRuby API for Mondrian OLAP Java library