From: Michael N. <mne...@us...> - 2003-06-03 18:46:51
|
Update of /cvsroot/ruby-dbi/src/lib/dbi In directory sc8-pr-cvs1:/tmp/cvs-serv21610 Modified Files: utils.rb Log Message: TableFormatter: convert false to "false", not "NULL" (MoonWolf) Index: utils.rb =================================================================== RCS file: /cvsroot/ruby-dbi/src/lib/dbi/utils.rb,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- utils.rb 31 May 2003 15:52:20 -0000 1.11 +++ utils.rb 3 Jun 2003 18:46:47 -0000 1.12 @@ -127,7 +127,8 @@ col_lengths = (0...(header.size)).collect do |colnr| [ (0...rows.size).collect { |rownr| - (rows[rownr][colnr] || "NULL").to_s.size + value = rows[rownr][colnr] + (value.nil? ? "NULL" : value).to_s.size }.max, header[colnr].size ].max @@ -144,7 +145,7 @@ output << indent + "|" row.each_with_index {|c,i| output << cellspace - str = (c || "NULL").to_s + str = (c.nil? ? "NULL" : c).to_s output << case orient when :left then str.ljust(col_lengths[i]) when :right then str.rjust(col_lengths[i]) |