sbfaulkner-rsql 0.9.8 → 0.9.9

data/lib/rsql/odbc.rb

@@ -38,7 +38,6 @@ module ODBC
     end
     
     def print(aliases = nil)
-
       # get the column names, etc.
       displayed_columns = columns(true)
 
@@ -58,6 +57,8 @@ module ODBC
       # TODO: handle huge result sets better... maybe paginate or base column width on initial n-record set
       resultset = fetch_all
 
+      return 0 if resultset.nil? || resultset.empty?
+      
       case self.class.mode
       when 'column'
         # determine the column widths (might be realy slow with large result sets)
@@ -68,7 +69,7 @@ module ODBC
               c.width = value.length if value.length > c.width
             end
           end
-        end unless resultset.nil?
+        end
 
         # prepare the horizontal rule for header and footer
         rule = "+-" + displayed_columns.collect { |c| '-' * c.width }.join("-+-") + "-+"
@@ -80,7 +81,7 @@ module ODBC
         # output each row
         resultset.each do |r|
           puts "| " + displayed_columns.collect { |c| r[c.index].to_s.ljust(c.width, ' ') }.join(" | ") + " |"
-        end unless resultset.nil?
+        end
 
         # output footer
         puts rule
@@ -90,8 +91,10 @@ module ODBC
         # output each row
         resultset.each do |r|
           puts displayed_columns.collect { |c| r[c.index].to_s }.to_csv(:force_quotes => true)
-        end unless resultset.nil?
+        end
       end
+      
+      return resultset.size
     end
   end
   

data/lib/rsql/rsql.rb

@@ -47,7 +47,18 @@ module RSQL
         begin
           @database.run(command) do |result|
             begin
-              result.print
+              if result.ncols > 0
+                case nrows = result.print
+                when 0
+                  puts "Empty set" unless OPTIONS[:quiet]
+                when 1
+                  puts "1 row in set" unless OPTIONS[:quiet]
+                else
+                  puts "#{nrows} rows in set" unless OPTIONS[:quiet]
+                end
+              else
+                puts "#{result.nrows} #{result.nrows == 1 ? 'row' : 'rows'} affected" unless OPTIONS[:quiet]
+              end
             rescue
               raise
             ensure
@@ -267,7 +278,7 @@ module RSQL
   # quiet-mode wins over verbose-mode
   OPTIONS.delete :verbose if OPTIONS[:quiet]
 
-  puts "#{COMMAND} v0.9.8 - Copyright (c) 2007-2008 unwwwired.net" unless OPTIONS[:quiet]
+  puts "#{COMMAND} v0.9.9 - Copyright (c) 2007-2008 unwwwired.net" unless OPTIONS[:quiet]
 
   begin
     # use dsn if provided

data/rsql.gemspec

@@ -1,7 +1,7 @@
 SPEC = Gem::Specification.new do |s| 
   # identify the gem
   s.name = "rsql" 
-  s.version = "0.9.8" 
+  s.version = "0.9.9" 
   s.author = "S. Brent Faulkner" 
   s.email = "brentf@unwwwired.net" 
   s.homepage = "http://www.unwwwired.net" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-rsql
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - S. Brent Faulkner