taps 0.2.12 → 0.2.13

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 12
+:patch: 13
 :major: 0
 :minor: 2

data/lib/taps/client_session.rb

@@ -118,8 +118,7 @@ class ClientSession
 		db.tables.each do |table_name|
 			table = db[table_name]
 			count = table.count
-			primary_key = db.primary_key(table_name.to_sym)
-			order = primary_key ? [primary_key.to_sym] : table.columns
+			order = Taps::Utils.order_by(db, table_name)
 			chunksize = self.default_chunksize
 
 			progress = ProgressBar.new(table_name.to_s, count)

data/lib/taps/server.rb

@@ -117,8 +117,7 @@ class Server < Sinatra::Default
 
 		db = session.connection
 		table = db[params[:table].to_sym]
-		primary_key = db.primary_key(params[:table].to_sym)
-		order = primary_key ? [primary_key.to_sym] : table.columns
+		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))
 		gzip_data = Taps::Utils.gzip(raw_data)
 		response['Taps-Checksum'] = Taps::Utils.checksum(gzip_data).to_s

data/lib/taps/utils.rb

@@ -85,5 +85,22 @@ module Utils
 			`#{File.dirname(__FILE__)}/../../bin/schema load_indexes #{database_url} #{tmp.path}`
 		end
 	end
+
+	def primary_key(db, table)
+		if db.respond_to?(:primary_key)
+			db.primary_key(table)
+		else
+			db.schema[table].select { |c| c[1][:primary_key] }.map { |c| c.first }.shift
+		end
+	end
+
+	def order_by(db, table)
+		pkey = primary_key(db, table)
+		if pkey
+			[pkey.to_sym]
+		else
+			db[table].columns
+		end
+	end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-31 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,6 @@ files:
 - spec/utils_spec.rb
 - lib/taps/progress_bar.rb
 - lib/taps/client_session.rb
-- lib/taps/server.rb
-- lib/taps/utils.rb
 - lib/taps/adapter_hacks.rb
 - lib/taps/adapter_hacks/invalid_text_limit.rb
 - lib/taps/adapter_hacks/non_rails_schema_dump.rb
@@ -99,6 +97,8 @@ files:
 - lib/taps/config.rb
 - lib/taps/cli.rb
 - lib/taps/db_session.rb
+- lib/taps/server.rb
+- lib/taps/utils.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml