taps 0.2.13 → 0.2.14

data/VERSION.yml

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

data/bin/schema

@@ -10,6 +10,7 @@ database_url = ARGV.shift.strip rescue ''
 
 def show_usage_and_exit
 	puts <<EOTXT
+	schema console <database_url>
 	schema dump <database_url>
 	schema indexes <database_url>
 	schema reset_db_sequences <database_url>
@@ -33,6 +34,12 @@ elsif cmd == 'load'
 	Taps::Schema.load(database_url, schema)
 elsif cmd == 'reset_db_sequences'
 	Taps::Schema.reset_db_sequences(database_url)
+elsif cmd == 'console'
+	Taps::Schema.connection(database_url)
+	$db = ActiveRecord::Base.connection
+	require 'irb'
+	require 'irb/completion'
+	IRB.start
 else
 	show_usage_and_exit
 end

data/lib/taps/adapter_hacks.rb

@@ -4,7 +4,7 @@ module Taps
 
 		LIST = {
 			:all => ['non_rails_schema_dump'],
-			:mysql => ['invalid_text_limit'],
+			:mysql => ['invalid_text_limit', 'mysql_invalid_primary_key'],
 			:postgresql => ['invalid_text_limit']
 		}
 

data/lib/taps/adapter_hacks/mysql_invalid_primary_key.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+	module ConnectionAdapters
+		class MysqlAdapter < AbstractAdapter
+			alias_method :orig_pk_and_sequence_for, :pk_and_sequence_for
+			# mysql accepts varchar as a primary key but most others do not.
+			# only say that a field is a primary key if mysql says so
+			# and the field is a kind of integer
+			def pk_and_sequence_for(table)
+				keys = []
+				execute("describe #{quote_table_name(table)}").each_hash do |h|
+					keys << h["Field"] if h["Key"] == "PRI" and !(h["Type"] =~ /int/).nil?
+				end
+				keys.length == 1 ? [keys.first, nil] : nil
+			end
+		end
+	end
+end

data/lib/taps/schema.rb

@@ -34,8 +34,9 @@ module Schema
 
 	def connection(database_url)
 		config = create_config(database_url)
+		c = ActiveRecord::Base.establish_connection(config)
 		Taps::AdapterHacks.load(config['adapter'])
-		ActiveRecord::Base.establish_connection(config)
+		c
 	end
 
 	def dump(database_url)

metadata

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