taps 0.3.6 → 0.3.7

data/Rakefile

@@ -13,7 +13,7 @@ begin
     s.add_dependency 'json_pure', '>= 1.2.0', '< 1.5.0'
     s.add_dependency 'sinatra', '~> 1.0.0'
     s.add_dependency 'rest-client', '~> 1.4.0'
-    s.add_dependency 'sequel', '~> 3.10.0'
+    s.add_dependency 'sequel', '~> 3.12.0'
     s.add_dependency 'sqlite3-ruby', '~> 1.2.0'
     s.add_dependency 'rack', '>= 1.0.1'
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 3
-:patch: 6
+:patch: 7
 :major: 0

data/bin/schema

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-gem 'sequel', '~> 3.10.0'
+gem 'sequel', '~> 3.12.0'
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
 

data/lib/taps/data_stream.rb

@@ -38,6 +38,10 @@ class DataStream
 		state[:table_name].to_sym
 	end
 
+	def table_name_sql
+		table_name.identifier
+	end
+
 	def to_hash
 		state.merge(:klass => self.class.to_s)
 	end
@@ -51,7 +55,7 @@ class DataStream
 	end
 
 	def table
-		@table ||= db[table_name]
+		@table ||= db[table_name_sql]
 	end
 
 	def order_by(name=nil)

data/lib/taps/operation.rb

@@ -538,7 +538,7 @@ class Push < Operation
 	def fetch_local_tables_info
 		tables_with_counts = {}
 		db.tables.each do |table|
-			tables_with_counts[table] = db[table].count
+			tables_with_counts[table] = db[table.to_sym.identifier].count
 		end
 		apply_table_filter(tables_with_counts)
 	end

data/lib/taps/schema.rb

@@ -14,15 +14,16 @@ module Schema
 	end
 
 	def dump_table(database_url, table)
+		table = table.to_sym
 		Sequel.connect(database_url) do |db|
 			<<END_MIG
 Class.new(Sequel::Migration) do
 	def up
-		#{db.dump_table_schema(table, :indexes => false)}
+		#{db.dump_table_schema(table.identifier, :indexes => false)}
 	end
 
 	def down
-		drop_table(\"#{table}\") if @db.table_exists?(\"#{table}\")
+		drop_table("#{table}") if @db.table_exists?("#{table}")
 	end
 end
 END_MIG

data/lib/taps/server.rb

@@ -119,7 +119,7 @@ class Server < Sinatra::Base
 
 		count = 0
 		session.conn do |db|
-			count = db[ params[:table].to_sym ].count
+			count = db[ params[:table].to_sym.identifier ].count
 		end
 		count.to_s
 	end

data/lib/taps/utils.rb

@@ -122,10 +122,11 @@ module Utils
 	end
 
 	def schema_bin(*args)
-		`#{File.dirname(__FILE__)}/../../bin/#{bin('schema')} #{args.map { |a| "'#{a}'" }.join(' ')}`
+		`'#{File.dirname(__FILE__)}/../../bin/#{bin('schema')}' #{args.map { |a| "'#{a}'" }.join(' ')}`
 	end
 
 	def primary_key(db, table)
+		table = table.to_sym.identifier unless table.kind_of?(Sequel::SQL::Identifier)
 		if db.respond_to?(:primary_key)
 			db.primary_key(table)
 		else
@@ -134,6 +135,7 @@ module Utils
 	end
 
 	def single_integer_primary_key(db, table)
+		table = table.to_sym.identifier unless table.kind_of?(Sequel::SQL::Identifier)
 		keys = db.schema(table).select { |c| c[1][:primary_key] and c[1][:type] == :integer }
 		not keys.nil? and keys.size == 1
 	end
@@ -143,6 +145,7 @@ module Utils
 		if pkey
 			pkey.kind_of?(Array) ? pkey : [pkey.to_sym]
 		else
+			table = table.to_sym.identifier unless table.kind_of?(Sequel::SQL::Identifier)
 			db[table].columns
 		end
 	end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,9 +75,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 10
+        - 12
         - 0
-        version: 3.10.0
+        version: 3.12.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -177,9 +177,9 @@ signing_key:
 specification_version: 3
 summary: simple database import/export app
 test_files: 
-- spec/utils_spec.rb
+- spec/base.rb
 - spec/cli_spec.rb
 - spec/data_stream_spec.rb
 - spec/operation_spec.rb
-- spec/base.rb
 - spec/server_spec.rb
+- spec/utils_spec.rb