rsql 0.2.0 → 0.2.1

data/README.rdoc

@@ -63,7 +63,7 @@ _user_, _password_, or _port_ values using the following syntax:
   [<user>[:<password>]@]<host>[:<port>]
 
 Once at the +rsql+ prompt, normal MySQL queries can be entered as
-expected, ending each with a semicolon (;) for columnar output or \G
+expected, ending each with a semicolon (;) for columnar output or \\G
 for line-by-line output formatting.
 
 Ruby commands will be evaluated for any content entered at the RSQL
@@ -77,14 +77,14 @@ the colon and the at sign):
 
   rsql root:@127.0.0.1
 
-Connect as the "readonly" user to the "internal.database.com" host's
-MySQL server after establishing a SSH tunnel to the
+Connect as the "readonly" user to the "internal.database.acme.com"
+host's MySQL server after establishing a SSH tunnel to the
 "external.acme.com" gateway. In this case, we are either expecting
 that our SSH configuration is set up with the right user name. Because
 we did not provide a password for MySQL, one will be obtained directly
 from the console (without echoing the characters typed):
 
-  rsql -ssh external.acme.com readonly@database.acme.com
+  rsql -ssh external.acme.com readonly@internal.database.acme.com
 
 == GETTING STARTED
 

data/bin/rsql

@@ -263,7 +263,7 @@ if ssh_host
         File.open(ipc_fn,'w'){|f| f.puts('start')}
         ssh_enabled = false
         Signal.trap('INT') do
-            $stderr.puts 'Shutting down...'
+            $stderr.puts 'Shutting down...' unless batch_input
             ssh_enabled = false
         end
         opts = {:timeout => 15}
@@ -279,7 +279,7 @@ if ssh_host
             opts[:password] = ssh_password if ssh_password
             ssh = Net::SSH.start(ssh_host, ssh_user, opts)
             ssh_enabled = true
-            printf "connected (#{$$})..."
+            printf "connected (#{$$})..." unless batch_input
             $stdout.flush
         rescue Net::SSH::AuthenticationFailed
             if 2 < password_retry_cnt
@@ -295,7 +295,9 @@ if ssh_host
         end
         if ssh_enabled
             ssh.forward.local(mysql_port, mysql_host, remote_mysql_port)
-            puts(verbose ? "ready (#{mysql_port} => #{remote_mysql_port})" : 'ready')
+            unless batch_input
+                puts(verbose ? "ready (#{mysql_port} => #{remote_mysql_port})" : 'ready')
+            end
             File.open(ipc_fn,'w'){|f| f.puts('ready')}
             ssh.loop(1) { ssh_enabled }
         end
@@ -330,7 +332,7 @@ mysql_conn = "#{mysql_host}:#{remote_mysql_port || mysql_port}"
 begin
     MySQLResults.conn = Mysql.new(mysql_host, mysql_user, mysql_password,
                                   MySQLResults.database_name, mysql_port)
-    puts 'connected'
+    puts 'connected' unless batch_input
 rescue Mysql::Error => ex
     if ex.message.include?('Client does not support authentication')
         $stderr.puts "failed to connect to #{mysql_conn} mysql server: unknown credentials?"
@@ -387,7 +389,7 @@ cmd_thread = Thread.new do
                     break
                 end
                 input << str
-                break if input =~ /([^\\];|\\G)\s*$/
+                break if input =~ /([^\\];|\\G)\s*$/ || input =~ /^\s*use\s+\w+\s*$/
                 # make sure we separate the lines with some whitespace if
                 # they didn't
                 input << ' ' unless str =~ /\s$/

data/lib/rsql.rb

@@ -2,7 +2,7 @@
 # Commands using an EvalContext for handling recipes.
 #
 module RSQL
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     require 'rsql/mysql_results'
     require 'rsql/eval_context'

data/lib/rsql/eval_context.rb

@@ -101,6 +101,7 @@ module RSQL
         end
 
         def reload
+            MySQLResults.reset_cache
             @loaded_fns.each{|fn| self.load(fn, false)}
             puts "loaded: #{@loaded_fns.inspect}"
         end
@@ -191,6 +192,7 @@ module RSQL
             end
 
             ret  = MySQLResults.complete(str)
+
             ret += @registrations.keys.sort_by{|sym|sym.to_s}.collect do |sym|
                 name = sym.to_s
                 if name.start_with?(str)
@@ -213,6 +215,8 @@ module RSQL
         # Convert a binary string value into a hexadecimal string.
         #
         def to_hexstr(bin, limit=@hexstr_limit, prefix='0x')
+            return bin if bin.nil?
+
             cnt = 0
             str = prefix << bin.gsub(/./m) do |ch|
                 if limit

data/lib/rsql/mysql_results.rb

@@ -37,7 +37,7 @@ module RSQL
         @@field_separator = ' '
         @@max_rows        = 1000
         @@database_name   = nil
-        @@databases       = nil
+        @@name_cache     = {}
 
         class MaxRowsException < RangeError
             def initialize(rows, max)
@@ -49,13 +49,36 @@ module RSQL
 
         class << self
 
+            # Get the underlying MySQL connection object in use.
+            #
             def conn; @@conn; end
-            def conn=(conn); @@conn = conn; end
 
+            # Set the underlying MySQL connection object to use which
+            # implicitly resets the name cache.
+            #
+            def conn=(conn)
+                @@conn = conn
+                reset_cache
+            end
+
+            # Get the field separator to use when writing rows in
+            # columns.
+            #
             def field_separator; @@field_separator; end
+
+            # Set the field separator to use when writing rows in
+            # columns.
+            #
             def field_separator=(sep); @@field_separator = sep; end
 
+            # Get the maximum number of rows to process before
+            # throwing a MaxRowsException.
+            #
             def max_rows; @@max_rows; end
+
+            # Set the maximum number of rows to process before
+            # throwing a MaxRowsException.
+            #
             def max_rows=(cnt); @@max_rows = cnt; end
 
             # Get the name of the current database in use.
@@ -69,72 +92,72 @@ module RSQL
             # Get the list of databases available.
             #
             def databases
-                if @@conn && @@databases.nil?
-                    @@databases = @@conn.list_dbs.sort
-                end
-                @@databases
+                @@name_cache.keys.sort
             end
 
-            # Force the table cache to be reread on the next request
-            # for tables.
+            # Get the list of tables available for the current
+            # database or a specific one.
             #
-            def reset_cache
-                @@databases       = nil
-                @@last_table_list = Hash.new{|h,k| h[k] = [Time.at(0), []]}
+            def tables(database=@@database_name)
+                @@name_cache[database] || []
             end
 
-            # Get the list of tables available (if a database is
-            # selected) at most once every ten seconds.
+            # Force the database and table names cache to be (re)loaded.
             #
-            def tables(database=@@database_name)
-                now = Time.now
-                (last, tnames) = @@last_table_list[database]
-                if last + 10 < now
-                    begin
-                        if @@conn
-                            if database && database != @@database_name
-                                tnames = @@conn.list_tables("FROM #{database}").sort
-                            else
-                                tnames = @@conn.list_tables.sort
-                            end
+            def reset_cache
+                @@name_cache = {}
+                begin
+                    if @@conn
+                        @@conn.list_dbs.each do |db_name|
+                            @@conn.select_db(db_name)
+                            @@name_cache[db_name] = @@conn.list_tables.sort
                         end
-                    rescue Mysql::Error => ex
-                        tnames = []
                     end
-                    @@last_table_list[database] = [now, tnames]
+                rescue Mysql::Error => ex
+                ensure
+                    if @@conn && @@database_name
+                        @@conn.select_db(@@database_name)
+                    end
                 end
-                tnames
             end
 
             # Provide a list of tab completions given the prompted
-            # value.
+            # case-insensitive value.
             #
             def complete(str)
                 return [] unless @@conn
 
+                ret = []
+
                 # offer table names from a specific database
                 if str =~ /^([^.]+)\.(.*)$/
                     db = $1
                     tb = $2
-                    ret = tables(db).collect do |n|
-                        if n.downcase.start_with?(tb)
-                            "#{db}.#{n}"
-                        else
-                            nil
+                    @@name_cache.each do |db_name, tnames|
+                        if db.casecmp(db_name) == 0
+                            tnames.each do |n|
+                                if m = n.match(/^(#{tb})/i)
+                                    ret << "#{db_name}.#{n}"
+                                end
+                            end
+                            break
                         end
                     end
-                    ret.compact!
                 else
-                    ret = databases.select{|n| n != @@database_name && n.downcase.start_with?(str)}
-                    if @@database_name
-                        # if we've selected a db then we want to offer
-                        # completions for other dbs as well as tables for
-                        # the currently selected db
-                        ret += tables.select{|n| n.downcase.start_with?(str)}
+                    @@name_cache.each do |db_name, tnames|
+                        if db_name == @@database_name
+                            tnames.each do |n|
+                                if m = n.match(/^(#{str})/i)
+                                    ret << n
+                                end
+                            end
+                        elsif m = db_name.match(/^(#{str})/i)
+                            ret << db_name
+                        end
                     end
                 end
 
-                return ret
+                return ret.sort
             end
 
             # Get results from a query.
@@ -200,9 +223,6 @@ module RSQL
 
         end # class << self
 
-        # init the cache
-        reset_cache
-
         ########################################
 
         def initialize(sql, elapsed, affected_rows,

data/test/test_commands.rb

@@ -21,7 +21,9 @@ class TestCommands < Test::Unit::TestCase
         @orig_stdout = $stdout
         $stdout = @strout = StringIO.new
         @ctx = EvalContext.new
-        @conn = MySQLResults.conn = mock('Mysql')
+        @conn = mock('Mysql')
+        @conn.expects(:list_dbs).returns([])
+        MySQLResults.conn = @conn
     end
 
     def teardown

data/test/test_eval_context.rb

@@ -18,14 +18,17 @@ class TestEvalContext < Test::Unit::TestCase
     include RSQL
 
     def setup
-        @conn = MySQLResults.conn = mock('Mysql')
+        @conn = mock('Mysql')
+        @conn.expects(:list_dbs).returns([])
         @conn.expects(:query).with(instance_of(String)).returns(nil)
         @conn.expects(:affected_rows).returns(0)
+        MySQLResults.conn = @conn
         @ctx = EvalContext.new
         @ctx.load(File.join(File.dirname(__FILE__),'..','example.rsqlrc'))
     end
 
     def test_load
+        @conn.expects(:list_dbs).returns([])
         orig = $stdout
         $stdout = out = StringIO.new
         @ctx.safe_eval('reload', nil, out)
@@ -108,7 +111,6 @@ class TestEvalContext < Test::Unit::TestCase
     end
 
     def test_complete
-        @conn.expects(:list_dbs).returns([])
         assert_equal(18, @ctx.complete('').size)
         assert_equal(['version'], @ctx.complete('v'))
         assert_equal(['.version'], @ctx.complete('.v'))

data/test/test_mysql_results.rb

@@ -22,9 +22,11 @@ class TestMySQLResults < Test::Unit::TestCase
     end
 
     def test_databases
-        assert_equal(nil, MySQLResults.databases)
+        assert_equal([], MySQLResults.databases)
         conn = mock('Mysql')
         conn.expects(:list_dbs).returns(['accounts'])
+        conn.expects(:select_db)
+        conn.expects(:list_tables).returns([])
         MySQLResults.conn = conn
         assert_equal(['accounts'], MySQLResults.databases)
     end
@@ -34,31 +36,37 @@ class TestMySQLResults < Test::Unit::TestCase
         MySQLResults.reset_cache
 
         conn = mock('Mysql')
+        conn.expects(:list_dbs).returns(['accounts'])
+        conn.expects(:select_db)
         conn.expects(:list_tables).returns(['users','groups'])
         MySQLResults.conn = conn
-        assert_equal(['groups','users'], MySQLResults.tables)
-        MySQLResults.reset_cache
 
-        conn.expects(:list_tables).with(instance_of(String)).returns(['prefs'])
-        assert_equal(['prefs'], MySQLResults.tables('accounts'))
+        assert_equal([], MySQLResults.tables)
+        MySQLResults.database_name = 'accounts'
+        assert_equal(['groups','users'], MySQLResults.tables)
+        assert_equal(['groups','users'], MySQLResults.tables('accounts'))
     end
 
     def test_complete
         assert_equal([], MySQLResults.complete(nil))
 
         conn = mock('Mysql')
-        conn.expects(:list_dbs).returns(['accounts','devices','locations'])
+        conn.expects(:list_dbs).returns(['Accounts','Devices','Locations'])
+        conn.expects(:select_db).times(3)
+        tbls = sequence(:tbls)
+        conn.expects(:list_tables).in_sequence(tbls).returns(['Prefs','Names'])
+        conn.expects(:list_tables).in_sequence(tbls).returns(['IPs'])
+        conn.expects(:list_tables).in_sequence(tbls).returns(['Street','City','State'])
         MySQLResults.conn = conn
 
-        assert_equal(['accounts','devices','locations'], MySQLResults.complete(''))
-        assert_equal(['accounts'], MySQLResults.complete('a'))
+        assert_equal(['Accounts','Devices','Locations'], MySQLResults.complete(''))
+        assert_equal(['Accounts'], MySQLResults.complete('a'))
 
-        MySQLResults.database_name = 'accounts'
-        conn.expects(:list_tables).returns(['prefs','names'])
-        assert_equal(['devices','locations','names','prefs'], MySQLResults.complete(''))
-        assert_equal(['names'], MySQLResults.complete('n'))
+        MySQLResults.database_name = 'Accounts'
+        assert_equal(['Devices','Locations','Names','Prefs'], MySQLResults.complete(''))
+        assert_equal(['Names'], MySQLResults.complete('n'))
 
-        assert_equal(['accounts.names','accounts.prefs'], MySQLResults.complete('accounts.'))
+        assert_equal(['Accounts.Names','Accounts.Prefs'], MySQLResults.complete('accounts.'))
     end
 
     def test_query
@@ -79,6 +87,7 @@ class TestMySQLResults < Test::Unit::TestCase
         res.expects(:fetch_row).in_sequence(rows).returns(nil)
 
         conn = mock('Mysql')
+        conn.expects(:list_dbs).returns([])
         conn.expects(:query).with(instance_of(String)).returns(res)
         conn.expects(:affected_rows).returns(1)
         MySQLResults.conn = conn

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsql
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brad Robel-Forrest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 Z
+date: 2011-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -124,6 +124,7 @@ files:
 - README.rdoc
 - bin/rsql
 - example.rsqlrc
+- extra/mysql-client-5.1.59-1.tgz
 - lib/rsql.rb
 - lib/rsql/commands.rb
 - lib/rsql/eval_context.rb