rsql 0.2.10 → 0.2.11

data/bin/rsql

@@ -270,6 +270,39 @@ end
 
 MySQLResults.max_rows ||= opts.batch_output ? 5000 : 1000
 
+# all children processes we need to clean up
+child_pids = []
+
+# a file that we can leverage as a poor-man's IPC between the ssh process during
+# setup and then with the mysql "kill" process
+ipc_fn = File.join(Dir.tmpdir, "rsql_ipc_#{$$}")
+
+at_exit do
+    child_pids.each do |pid|
+        begin
+            Process.kill('TERM', pid)
+            killed = false
+            5.times do
+                if Process.waitpid(pid, Process::WNOHANG)
+                    killed = true
+                    break
+                end
+                sleep 1
+            end
+            Process.kill('KILL', pid) unless killed
+        rescue Errno::ESRCH
+            # do nothing, process is already gone
+        rescue Exception => ex
+            if opts.verbose
+                $stderr.puts("#{ex.class}: #{ex.message}", ex.backtrace)
+            else
+                $stderr.puts(ex.message)
+            end
+        end
+    end
+    File.unlink(ipc_fn) if File.exists?(ipc_fn)
+end
+
 if opts.ssh_host
 
     # might need to open an idle channel here so server doesn't close on
@@ -287,10 +320,6 @@ if opts.ssh_host
     # calls...so we'll run ssh in the background since its only
     # purpose is to forward us in for accessing the mysql server
 
-    # we'll use a poor-man's ipc to determine when the ssh process is
-    # ready
-    ipc_fn = File.join(Dir.tmpdir, "rsql_ssh_#{$$}.pid")
-
     ssh = nil
     ssh_pid = Process.fork do
         File.open(ipc_fn,'w'){|f| f.puts('start')}
@@ -347,41 +376,15 @@ if opts.ssh_host
         end
     end
 
-    at_exit do
-        if ssh_pid && 0 <= ssh_pid
-            begin
-                Process.kill('TERM', ssh_pid)
-                killed = false
-                5.times do
-                    if Process.waitpid(ssh_pid, Process::WNOHANG)
-                        killed = true
-                        break
-                    end
-                    sleep 1
-                end
-                Process.kill('KILL', ssh_pid) unless killed
-            rescue Errno::ESRCH
-                # do nothing, process is already gone
-            rescue Exception => ex
-                if opts.verbose
-                    $stderr.puts("#{ex.class}: #{ex.message}", ex.backtrace)
-                else
-                    $stderr.puts(ex.message)
-                end
-            end
-        end
-        File.unlink(ipc_fn) if File.exists?(ipc_fn)
-    end
+    child_pids << ssh_pid
 
     ipc_state = ''
     15.times do
         sleep(1)
-        File.open(ipc_fn,'r'){|f| ipc_state = f.gets.strip}
+        ipc_state = IO.read(ipc_fn).strip
         break if ipc_state == 'ready' || ipc_state == 'fail'
     end
 
-    File.unlink(ipc_fn)
-
     unless ipc_state == 'ready'
         # give the child time to exit
         sleep(0.5)
@@ -402,7 +405,6 @@ mysql_conn = "#{opts.mysql_host}:#{opts.remote_mysql_port || opts.mysql_port}"
 begin
     MySQLResults.conn = Mysql.new(opts.mysql_host, opts.mysql_user, opts.mysql_password,
                                   MySQLResults.database_name, opts.mysql_port)
-    MySQLResults.conn.reconnect = true
     puts 'connected' unless opts.batch_output
 rescue Mysql::Error => ex
     if ex.message.include?('Client does not support authentication')
@@ -426,8 +428,6 @@ rescue Exception => ex
     exit 1
 end
 
-eval_context.call_init_registrations
-
 history_fn = File.join(ENV['HOME'], ".#{bn}_history")
 if File.exists?(history_fn) && 0 < File.size(history_fn)
     YAML.load_file(history_fn).each {|i| Readline::HISTORY.push(i)}
@@ -436,9 +436,17 @@ end
 Readline.completion_proc = eval_context.method(:complete)
 
 cmd_thread = Thread.new do
+    mysql_tid = nil
     me = Thread.current
     me[:shutdown] = false
     until me[:shutdown] do
+        if mysql_tid != MySQLResults.conn.thread_id
+            # update the thread id for the mysql kill process
+            mysql_tid = MySQLResults.conn.thread_id
+            File.open(ipc_fn,'w'){|f| f.puts(mysql_tid)}
+            eval_context.call_init_registrations
+        end
+
         default_displayer = :display_by_column
         if opts.batch_input
             default_displayer = :display_by_batch if opts.batch_output
@@ -466,6 +474,7 @@ cmd_thread = Thread.new do
                 prompt = ''
             end
             if input.nil? || me[:shutdown]
+                me[:shutdown] = true
                 puts
                 break
             end
@@ -484,33 +493,32 @@ cmd_thread = Thread.new do
     end
 end
 
-# keep a secondary connection to allow us to kill off a running query
-kill_conn = Mysql.new(opts.mysql_host, opts.mysql_user, opts.mysql_password,
-                      MySQLResults.database_name, opts.mysql_port)
-opts.delete_field(:mysql_password)
-
-Signal.trap('INT') do
-    # emulate MySQL's behavior
-    if MySQLResults.conn && MySQLResults.conn.busy?
-        tid = MySQLResults.conn.thread_id
-        $stderr.puts "Ctrl-C -- sending \"KILL QUERY #{tid}\" to server..."
-        kill_conn.kill(tid)
-        10.times do
-            break unless MySQLResults.conn.busy?
-            sleep(0.5)
+kill_pid = Process.fork do
+    # keep a secondary connection to allow us to kill off a running query in a
+    # subprocess so we don't get bound up by the main process trying to deal
+    # with results
+    kill_conn = Mysql.new(opts.mysql_host, opts.mysql_user, opts.mysql_password, nil, opts.mysql_port)
+    Signal.trap('TERM'){Kernel.exit!}
+    Signal.trap('INT') do
+        mysql_tid = IO.read(ipc_fn).strip.to_i
+        is_busy = false
+        kill_conn.list_processes.each do |row|
+            if row[0].to_i == mysql_tid && row[4] != 'Sleep'
+                $stderr.puts "Ctrl-C -- sending \"KILL QUERY #{mysql_tid}\" to server..."
+                kill_conn.kill(mysql_tid)
+                break
+            end
         end
-        MySQLResults.conn.select_db(MySQLResults.database_name)
-        eval_context.call_init_registrations
-    else
-        $stderr.puts 'Ctrl-C -- exit!'
-        cmd_thread[:shutdown] = true
-        sleep(0.3)
-        cmd_thread.kill
     end
+    loop{sleep 0x7fffffff}
 end
 
+child_pids << kill_pid
+opts.delete_field(:mysql_password)
+Signal.trap('INT', nil)
+
 Signal.trap('CHLD') do
-    unless opts.batch_output
+    if ssh_pid && !opts.batch_output && !cmd_thread[:shutdown]
         $stderr.puts "SSH child (#{ssh_pid}) stopped--shutting down..."
     end
     if MySQLResults.conn && MySQLResults.conn.busy?

data/lib/rsql.rb

@@ -5,7 +5,7 @@
 # information.
 #
 module RSQL
-    VERSION = '0.2.10'
+    VERSION = '0.2.11'
 
     require 'rsql/mysql_results'
     require 'rsql/eval_context'

data/lib/rsql/commands.rb

@@ -70,6 +70,7 @@ module RSQL
                     esc = ''
                 end
 
+                found_maps = false
                 if match_before_bang
                     new_bangs = {}
                     match.split(/\s*,\s*/).each do |ent|
@@ -78,20 +79,23 @@ module RSQL
                             # they are using a bang but have no maps
                             # so we assume this is a != or something
                             # similar and let it go through unmapped
-                            esc = match_before_bang + '!' + match
+                            match = match_before_bang + '!' + match
                             match_before_bang = nil
-                            break
-                        end
-                        if val.strip == 'nil'
-                            new_bangs[key.strip] = nil
                         else
-                            new_bangs[key.strip] = val.to_sym
+                            found_maps = true
+                            if val.strip == 'nil'
+                                new_bangs[key.strip] = nil
+                            else
+                                new_bangs[key.strip] = val.to_sym
+                            end
                         end
                     end
-                    next unless match_before_bang
-                    match = match_before_bang
-                    match_before_bang = nil
-                    bangs.merge!(new_bangs)
+                    if found_maps
+                        next unless match_before_bang
+                        match = match_before_bang
+                        match_before_bang = nil
+                        bangs.merge!(new_bangs)
+                    end
                 end
 
                 if sep == ?!

data/lib/rsql/mysql_results.rb

@@ -67,7 +67,9 @@ module RSQL
             # implicitly resets the name cache.
             #
             def conn=(conn)
-                @@conn = conn
+                if @@conn = conn
+                    @@conn.reconnect = true
+                end
                 reset_cache
             end
 
@@ -197,6 +199,13 @@ module RSQL
             # Get results from a query.
             #
             def query(sql, eval_context, raw=false, max_rows=@@max_rows)
+                if @@conn.reconnected?
+                    # make sure we stick with the user's last database in case
+                    # we had to reconnect (probably because the query thread was
+                    # killed
+                    @@conn.select_db(@@database_name) if @@database_name
+                end
+
                 @@history.shift if @@max_history <= @@history.size 
                 @@history << sql
 

data/test/test_commands.rb

@@ -23,6 +23,7 @@ class TestCommands < Test::Unit::TestCase
         @ctx = EvalContext.new
         @conn = mock('Mysql')
         @conn.expects(:list_dbs).returns([])
+        @conn.expects(:reconnect=)
         MySQLResults.conn = @conn
     end
 
@@ -42,6 +43,7 @@ class TestCommands < Test::Unit::TestCase
         cmds = Commands.new('do some silly stuff', :display_by_column)
         @conn.expects(:query).with(instance_of(String)).returns(nil)
         @conn.expects(:affected_rows).returns(1)
+        @conn.expects(:reconnected?)
         cmds.run!(@ctx)
         assert_match(/Query OK, 1 row affected/, @strout.string)
     end
@@ -61,25 +63,38 @@ class TestCommands < Test::Unit::TestCase
     def test_multiple
         @conn.expects(:query).with('one thing').returns(nil)
         @conn.expects(:affected_rows).returns(1)
+        @conn.expects(:reconnected?)
         cmds = Commands.new('. "one thing" ; . puts :hello.inspect', :display_by_column)
         cmds.run!(@ctx)
         assert_match(/^QueryOK,1rowaffected\(\d+.\d+sec\):hello$/,
                      @strout.string.gsub(/\s+/,''))
     end
 
-    def test_bangs
+    def test_bang
         cmds = Commands.new('silly stuff ! this => that', :display_by_column)
         @conn.expects(:query).with('silly stuff').returns(nil)
         @conn.expects(:affected_rows).returns(13)
+        @conn.expects(:reconnected?)
         cmds.run!(@ctx)
         assert_match(/Query OK, 13 rows affected/, @strout.string)
+    end
 
-        # now test logic to continue if it _doesn't_ look like a bang
+    def test_bang_with_no_map
         cmds = Commands.new('silly stuff ! more things', :display_by_column)
         @conn.expects(:query).with('silly stuff ! more things').returns(nil)
         @conn.expects(:affected_rows).returns(4)
+        @conn.expects(:reconnected?)
         cmds.run!(@ctx)
         assert_match(/Query OK, 4 rows affected/, @strout.string)
     end
 
+    def test_bang_with_pipe
+        cmds = Commands.new('silly stuff != this | puts @results.sql', :display_by_column)
+        @conn.expects(:query).with('silly stuff != this').returns(nil)
+        @conn.expects(:affected_rows).returns(21)
+        @conn.expects(:reconnected?)
+        cmds.run!(@ctx)
+        assert_match("silly stuff != this\n", @strout.string)
+    end
+
 end # class TestCommands

data/test/test_eval_context.rb

@@ -22,6 +22,8 @@ class TestEvalContext < Test::Unit::TestCase
         @conn.expects(:list_dbs).returns([])
         @conn.expects(:query).with(instance_of(String)).returns(nil)
         @conn.expects(:affected_rows).returns(0)
+        @conn.expects(:reconnect=)
+        @conn.expects(:reconnected?)
         MySQLResults.conn = @conn
         @ctx = EvalContext.new
         @ctx.load(File.join(File.dirname(__FILE__),'..','example.rsqlrc'))
@@ -32,6 +34,7 @@ class TestEvalContext < Test::Unit::TestCase
         $stdout = out = StringIO.new
         @conn.expects(:query).with(instance_of(String)).returns(nil)
         @conn.expects(:affected_rows).returns(0)
+        @conn.expects(:reconnected?)
         @ctx.safe_eval('reload', nil, out)
         assert_match(/loaded: .+?example.rsqlrc/, out.string)
     ensure

data/test/test_mysql_results.rb

@@ -24,6 +24,7 @@ class TestMySQLResults < Test::Unit::TestCase
     def test_databases
         assert_equal([], MySQLResults.databases)
         conn = mock('Mysql')
+        conn.expects(:reconnect=)
         conn.expects(:list_dbs).returns(['accounts'])
         conn.expects(:select_db)
         conn.expects(:list_tables).returns([])
@@ -36,6 +37,7 @@ class TestMySQLResults < Test::Unit::TestCase
         MySQLResults.reset_cache
 
         conn = mock('Mysql')
+        conn.expects(:reconnect=)
         conn.expects(:list_dbs).returns(['accounts'])
         conn.expects(:select_db)
         conn.expects(:list_tables).returns(['users','groups'])
@@ -51,6 +53,7 @@ class TestMySQLResults < Test::Unit::TestCase
         assert_equal([], MySQLResults.complete(nil))
 
         conn = mock('Mysql')
+        conn.expects(:reconnect=)
         conn.expects(:list_dbs).returns(['Accounts','Devices','Locations'])
         conn.expects(:select_db).times(3)
         tbls = sequence(:tbls)
@@ -87,9 +90,11 @@ class TestMySQLResults < Test::Unit::TestCase
         res.expects(:fetch_row).in_sequence(rows).returns(nil)
 
         conn = mock('Mysql')
+        conn.expects(:reconnect=)
         conn.expects(:list_dbs).returns([])
         conn.expects(:query).with(instance_of(String)).returns(res)
         conn.expects(:affected_rows).returns(1)
+        conn.expects(:reconnected?)
         MySQLResults.conn = conn
 
         bangs = mock('bangs')
@@ -145,9 +150,11 @@ class TestMySQLResults < Test::Unit::TestCase
         res.expects(:fetch_row).in_sequence(rows).returns(nil)
 
         conn = mock('Mysql')
+        conn.expects(:reconnect=)
         conn.stubs(:list_dbs).returns([])
         conn.stubs(:query).with(instance_of(String)).returns(res)
         conn.stubs(:affected_rows).returns(1)
+        conn.expects(:reconnected?).times(4)
         MySQLResults.reset_history
         MySQLResults.conn = conn
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsql
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Brad Robel-Forrest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-18 00:00:00 Z
+date: 2012-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -124,7 +124,6 @@ files:
 - bin/rsql
 - example.rsqlrc
 - example.rsqlrc.rdoc
-- extra/mysql-client-5.1.59-1.tgz
 - lib/rsql.rb
 - lib/rsql/commands.rb
 - lib/rsql/eval_context.rb
@@ -166,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby-based MySQL command line with recipes.