Fix Drill through results values for MS SQL database

CLOB columns should be converted to string

lib/mondrian/olap/result.rb

@@ -449,13 +449,32 @@ def self.java_to_ruby_value(value, column_type = nil)
           value
         when Java::JavaMath::BigDecimal
           BigDecimal(value.to_s)
+        when Java::JavaSql::Clob
+          clob_to_string(value)
         else
           value
         end
       end
 
       private
 
+      def self.clob_to_string(value)
+        if reader = value.getCharacterStream
+          buffered_reader = Java::JavaIo::BufferedReader.new(reader)
+          result = []
+          while str = buffered_reader.readLine
+            result << str
+          end
+          result.join("\n")
+        end
+      ensure
+        if buffered_reader
+          buffered_reader.close
+        elsif reader
+          reader.close
+        end
+      end
+
       def axes
         @axes ||= @raw_cell_set.getAxes
       end

spec/fixtures/MondrianTest.xml

@@ -87,6 +87,7 @@ fullname
           </SQL>
         </OrdinalExpression>
         <Property name="Gender" column="gender"/>
+        <Property name="Description" column="description"/>
       </Level>
     </Hierarchy>
   </Dimension>

spec/fixtures/MondrianTestOracle.xml

@@ -87,6 +87,7 @@ FULLNAME
           </SQL>
         </OrdinalExpression>
         <Property name="Gender" column="GENDER"/>
+        <Property name="Description" column="DESCRIPTION"/>
       </Level>
     </Hierarchy>
   </Dimension>

spec/query_spec.rb

@@ -895,14 +895,16 @@ def sql_select_numbers(select_string)
       @drill_through = @result.drill_through(row: 0, column: 0,
         return: [
           "Name([Customers].[Name])",
-          "Property([Customers].[Name], 'Gender')"
+          "Property([Customers].[Name], 'Gender')",
+          "Property([Customers].[Name], 'Description')"
         ]
       )
-      @drill_through.column_labels.should == [ "Name", "Gender" ]
+      @drill_through.column_labels.should == [ "Name", "Gender", "Description" ]
       @drill_through.rows.should == @sql.select_rows(<<-SQL
         SELECT
           customers.fullname,
-          customers.gender
+          customers.gender,
+          customers.description
         FROM
           sales,
           customers,
@@ -919,7 +921,8 @@ def sql_select_numbers(select_string)
           customers.id = sales.customer_id
         ORDER BY
           customers.fullname,
-          customers.gender
+          customers.gender,
+          customers.description
       SQL
       )
     end

spec/rake_tasks.rb

@@ -40,6 +40,14 @@
         t.string      :lname, :limit => 30
         t.string      :fullname, :limit => 60
         t.string      :gender, :limit => 30
+        # Mondrian does not support properties with Oracle CLOB type
+        # as it tries to GROUP BY all columns when loading a dimension table
+        if MONDRIAN_DRIVER == 'oracle'
+          t.string      :description, :limit => 4000
+        else
+          t.text        :description
+        end
+
       end
 
       create_table :sales, :force => true, :id => false do |t|
@@ -207,7 +215,8 @@ class Sales < ActiveRecord::Base
           :fname => "First#{i}",
           :lname => "Last#{i}",
           :fullname => "First#{i} Last#{i}",
-          :gender => i % 2 == 0 ? "M" : "F"
+          :gender => i % 2 == 0 ? "M" : "F",
+          :description => 100.times.map{"1234567890"}.join("\n")
         )
       end
     end