lib/data_miner/step/sql.rb in data_miner-2.5.2 vs lib/data_miner/step/sql.rb in data_miner-3.0.0.alpha

@@ -41,11 +41,11 @@
       def start
         if statement
           ActiveRecord::Base.connection.execute statement
         else
           tmp_path = UnixUtils.curl url
-          send config[:adapter], tmp_path
+          send config['adapter'], tmp_path
           File.unlink tmp_path
         end
       end
 
       private
@@ -53,28 +53,28 @@
       def config
         if ActiveRecord::Base.respond_to?(:connection_config)
           ActiveRecord::Base.connection_config
         else
           ActiveRecord::Base.connection_pool.spec.config
-        end
+        end.stringify_keys
       end
 
       def mysql(path)
-        connect = if config[:socket]
-          [ '--socket', config[:socket] ]
+        connect = if config['socket']
+          [ '--socket', config['socket'] ]
         else
-          [ '--host', config.fetch(:host, '127.0.0.1'), '--port', config.fetch(:port, 3306).to_s ]
+          [ '--host', config.fetch('host', '127.0.0.1'), '--port', config.fetch('port', 3306).to_s ]
         end
         
         argv = [
           'mysql',
           '--compress',
-          '--user', config[:username],
-          "-p#{config[:password]}",
+          '--user', config['username'],
+          "-p#{config['password']}",
           connect,
           '--default-character-set', 'utf8',
-          config[:database]
+          config['database']
         ].flatten
 
         File.open(path) do |f|
           pid = POSIX::Spawn.spawn(*(argv+[{:in => f}]))
           ::Process.waitpid pid
@@ -95,11 +95,11 @@
         env['PGUSER']     = config['username'].to_s if config['username']
 
         argv = [
           'psql',
           '--quiet',
-          '--dbname', config[:database],
+          '--dbname', config['database'],
           '--file',   path
         ].flatten
         
         child = POSIX::Spawn::Child.new(*([env]+argv))
         $stderr.puts child.out
@@ -111,10 +111,10 @@
       end
 
       def sqlite3(path)
         argv = [
           'sqlite3',
-          config[:database]
+          config['database']
         ]
         File.open(path) do |f|
           pid = POSIX::Spawn.spawn(*(argv+[{:in => f}]))
           ::Process.waitpid pid
         end