1+ # frozen_string_literal: true
2+
13module Mondrian
24 module OLAP
35 class Connection
@@ -19,7 +21,7 @@ def initialize(params = {})
1921
2022 def connect
2123 Error . wrap_native_exception do
22- # hack to call private constructor of MondrianOlap4jDriver
24+ # Hack to call private constructor of MondrianOlap4jDriver
2325 # to avoid using DriverManager which fails to load JDBC drivers
2426 # because of not seeing JRuby required jar files
2527 cons = Java ::MondrianOlap4j ::MondrianOlap4jDriver . java_class . declared_constructor
@@ -30,7 +32,7 @@ def connect
3032 props . setProperty ( 'JdbcUser' , @params [ :username ] ) if @params [ :username ]
3133 props . setProperty ( 'JdbcPassword' , @params [ :password ] ) if @params [ :password ]
3234
33- # on Oracle increase default row prefetch size
35+ # On Oracle increase default row prefetch size
3436 # as default 10 is very low and slows down loading of all dimension members
3537 if @driver == 'oracle'
3638 prefetch_rows = @params [ :prefetch_rows ] || 100
@@ -39,7 +41,7 @@ def connect
3941
4042 conn_string = connection_string
4143
42- # latest Mondrian version added ClassResolver which uses current thread class loader to load some classes
44+ # Latest Mondrian version added ClassResolver which uses current thread class loader to load some classes
4345 # therefore need to set it to JRuby class loader to ensure that Mondrian classes are found
4446 # (e.g. when running mondrian-olap inside OSGi container)
4547 current_thread = Java ::JavaLang ::Thread . currentThread
@@ -53,7 +55,7 @@ def connect
5355
5456 @raw_connection = @raw_jdbc_connection . unwrap ( Java ::OrgOlap4j ::OlapConnection . java_class )
5557 @raw_catalog = @raw_connection . getOlapCatalog
56- # currently it is assumed that there is just one schema per connection catalog
58+ # Currently it is assumed that there is just one schema per connection catalog
5759 @raw_schema = @raw_catalog . getSchemas . first
5860 @raw_mondrian_connection = @raw_connection . getMondrianConnection
5961 @raw_schema_reader = @raw_mondrian_connection . getSchemaReader
@@ -89,7 +91,7 @@ def execute(query_string, parameters = {})
8991 end
9092 end
9193
92- # access mondrian.olap.Parameter object
94+ # Access mondrian.olap.Parameter object
9395 def mondrian_parameter ( parameter_name )
9496 Error . wrap_native_exception do
9597 @raw_schema_reader . getParameter ( parameter_name )
@@ -144,7 +146,7 @@ def self.raw_schema_key(schema_key)
144146 end
145147
146148 def cube_names
147- @raw_schema . getCubes . map { | c | c . getName }
149+ @raw_schema . getCubes . map ( & : getName)
148150 end
149151
150152 def cube ( name )
@@ -193,7 +195,7 @@ def role_name
193195 end
194196
195197 def role_names
196- # workaround to access non-public method (was not public when using inside Torquebox)
198+ # Workaround to access non-public method
197199 # @raw_connection.getRoleNames.to_a
198200 @raw_connection . java_method ( :getRoleNames ) . call . to_a
199201 end
@@ -206,7 +208,7 @@ def role_name=(name)
206208
207209 def role_names = ( names )
208210 Error . wrap_native_exception do
209- # workaround to access non-public method (was not public when using inside Torquebox)
211+ # Workaround to access non-public method
210212 # @raw_connection.setRoleNames(Array(names))
211213 names = Array ( names )
212214 @raw_connection . java_method ( :setRoleNames , [ Java ::JavaUtil ::List . java_class ] ) . call ( names )
@@ -225,7 +227,7 @@ def locale=(locale)
225227 @raw_connection . setLocale ( java_locale )
226228 end
227229
228- # access MondrianServer instance
230+ # Access MondrianServer instance
229231 def mondrian_server
230232 Error . wrap_native_exception do
231233 @raw_connection . getMondrianConnection . getServer
@@ -325,11 +327,11 @@ def jdbc_uri
325327
326328 def connection_string
327329 string = "jdbc:mondrian:Jdbc=#{ quote_string ( jdbc_uri ) } ;JdbcDrivers=#{ jdbc_driver } ;"
328- # by default use content checksum to reload schema when catalog has changed
330+ # By default use content checksum to reload schema when catalog has changed
329331 string += "UseContentChecksum=true;" unless @params [ :use_content_checksum ] == false
330332 string += "PinSchemaTimeout=#{ @params [ :pin_schema_timeout ] } ;" if @params [ :pin_schema_timeout ]
331333 if role = @params [ :role ] || @params [ :roles ]
332- roles = Array ( role ) . map { |r | r && r . to_s . gsub ( ',' , ',,' ) } . compact
334+ roles = Array ( role ) . map { |r | r && r . to_s . gsub ( ',' , ',,' ) } . compact
333335 string += "Role=#{ quote_string ( roles . join ( ',' ) ) } ;" unless roles . empty?
334336 end
335337 if locale = @params [ :locale ]
@@ -371,14 +373,14 @@ def jdbc_uri_mysql
371373 alias_method :jdbc_uri_mariadb , :jdbc_uri_generic
372374
373375 def jdbc_uri_oracle
374- # connection using TNS alias
376+ # Connection using TNS alias
375377 if @params [ :database ] && !@params [ :host ] && !@params [ :url ] && ENV [ 'TNS_ADMIN' ]
376378 "jdbc:oracle:thin:@#{ @params [ :database ] } "
377379 else
378380 @params [ :url ] || begin
379381 database = @params [ :database ]
380382 unless database =~ %r{^(:|/)}
381- # assume database is a SID if no colon or slash are supplied (backward-compatibility)
383+ # Assume database is a SID if no colon or slash are supplied (backward-compatibility)
382384 database = ":#{ database } "
383385 end
384386 "jdbc:oracle:thin:@#{ @params [ :host ] || 'localhost' } :#{ @params [ :port ] || 1521 } #{ database } "
@@ -470,7 +472,7 @@ def catalog_content
470472 if @params [ :catalog_content ]
471473 @params [ :catalog_content ]
472474 elsif @params [ :schema ]
473- @params [ :schema ] . to_xml ( : driver => @driver )
475+ @params [ :schema ] . to_xml ( driver : @driver )
474476 else
475477 raise ArgumentError , "Specify catalog with :catalog, :catalog_content or :schema option"
476478 end
@@ -483,7 +485,7 @@ def quote_string(string)
483485 def set_statement_parameters ( statement , parameters )
484486 if parameters && !parameters . empty?
485487 parameters = parameters . dup
486- # define addtional parameters which can be accessed from user defined functions
488+ # Define additional parameters which can be accessed from user defined functions
487489 if define_parameters = parameters . delete ( :define_parameters )
488490 query_validator = statement . getQuery . createValidator
489491 define_parameters . each do |dp_name , dp_value |
0 commit comments