taps 0.2.15 → 0.2.16

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 15
+:patch: 16
 :major: 0
 :minor: 2

data/lib/taps/client_session.rb

@@ -120,6 +120,7 @@ class ClientSession
 			count = table.count
 			order = Taps::Utils.order_by(db, table_name)
 			chunksize = self.default_chunksize
+			string_columns = Taps::Utils.incorrect_blobs(db, table_name)
 
 			progress = ProgressBar.new(table_name.to_s, count)
 
@@ -127,7 +128,7 @@ class ClientSession
 			loop do
 				row_size = 0
 				chunksize = Taps::Utils.calculate_chunksize(chunksize) do |c|
-					rows = Taps::Utils.format_data(table.order(*order).limit(c, offset).all)
+					rows = Taps::Utils.format_data(table.order(*order).limit(c, offset).all, string_columns)
 					break if rows == { }
 
 					row_size = rows[:data].size

data/lib/taps/server.rb

@@ -118,7 +118,8 @@ class Server < Sinatra::Default
 		db = session.connection
 		table = db[params[:table].to_sym]
 		order = Taps::Utils.order_by(db, params[:table].to_sym)
-		raw_data = Marshal.dump(Taps::Utils.format_data(table.order(*order).limit(chunk, offset).all))
+		string_columns = Taps::Utils.incorrect_blobs(db, params[:table].to_sym)
+		raw_data = Marshal.dump(Taps::Utils.format_data(table.order(*order).limit(chunk, offset).all, string_columns))
 		gzip_data = Taps::Utils.gzip(raw_data)
 		response['Taps-Checksum'] = Taps::Utils.checksum(gzip_data).to_s
 		response['Content-Type'] = "application/octet-stream"

data/lib/taps/utils.rb

@@ -31,15 +31,38 @@ module Utils
 		data
 	end
 
-	def format_data(data)
+	def format_data(data, string_columns)
 		return {} if data.size == 0
 		header = data[0].keys
 		only_data = data.collect do |row|
+			row = blobs_to_string(row, string_columns)
 			header.collect { |h| row[h] }
 		end
 		{ :header => header, :data => only_data }
 	end
 
+	# mysql text and blobs fields are handled the same way internally
+	# this is not true for other databases so we must check if the field is
+	# actually text and manually convert it back to a string
+	def incorrect_blobs(db, table)
+		return [] unless db.class.to_s == "Sequel::MySQL::Database"
+
+		columns = []
+		db.schema[table].each do |data|
+			column, cdata = data
+			columns << column if cdata[:db_type] =~ /text/
+		end
+		columns
+	end
+
+	def blobs_to_string(row, columns)
+		return row if columns.size == 0
+		columns.each do |c|
+			row[c] = row[c].to_s if row[c].kind_of?(Sequel::SQL::Blob)
+		end
+		row
+	end
+
 	def calculate_chunksize(old_chunksize)
 		chunksize = old_chunksize
 

data/spec/utils_spec.rb

@@ -16,7 +16,7 @@ describe Taps::Utils do
 	end
 
 	it "formats a data hash into one hash that contains an array of headers and an array of array of data" do
-		Taps::Utils.format_data([ { :x => 1, :y => 1 }, { :x => 2, :y => 2 } ]).should == { :header => [ :x, :y ], :data => [ [1, 1], [2, 2] ] }
+		Taps::Utils.format_data([ { :x => 1, :y => 1 }, { :x => 2, :y => 2 } ], []).should == { :header => [ :x, :y ], :data => [ [1, 1], [2, 2] ] }
 	end
 
 	it "scales chunksize down slowly when the time delta of the block is just over a second" do
@@ -45,5 +45,16 @@ describe Taps::Utils do
 	it "will reset the chunksize to a small value if we got a broken pipe exception" do
 		Taps::Utils.calculate_chunksize(1000) { |c| raise Errno::EPIPE if c == 1000; c.should == 100 }.should == 200
 	end
+
+	it "returns a list of columns that are text fields if the database is mysql" do
+		@db = mock("db")
+		@db.class.stubs(:to_s).returns("Sequel::MySQL::Database")
+		@db.stubs(:schema).returns(mock("schema"))
+		@db.schema.stubs(:[]).with(:mytable).returns([
+			[:id, { :db_type => "int" }],
+			[:mytext, { :db_type => "text" }]
+		])
+		Taps::Utils.incorrect_blobs(@db, :mytable).should == [:mytext]
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-14 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,18 +89,18 @@ files:
 - spec/client_session_spec.rb
 - spec/utils_spec.rb
 - lib/taps/progress_bar.rb
-- lib/taps/utils.rb
+- lib/taps/adapter_hacks.rb
 - lib/taps/adapter_hacks/non_rails_schema_dump.rb
 - lib/taps/adapter_hacks/invalid_text_limit.rb
 - lib/taps/adapter_hacks/mysql_invalid_primary_key.rb
 - lib/taps/adapter_hacks/invalid_binary_limit.rb
-- lib/taps/client_session.rb
-- lib/taps/adapter_hacks.rb
+- lib/taps/utils.rb
+- lib/taps/server.rb
 - lib/taps/config.rb
 - lib/taps/cli.rb
 - lib/taps/schema.rb
-- lib/taps/server.rb
 - lib/taps/db_session.rb
+- lib/taps/client_session.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml