db_leftovers 1.0.1 → 1.1.0

data/Gemfile

@@ -18,6 +18,8 @@ group :development do
 end
 
 group :test do
-  gem 'activerecord-postgresql-adapter'
-  gem 'activerecord-mysql2-adapter'
+  gem 'activerecord-postgresql-adapter', :platforms => :ruby
+  gem 'activerecord-mysql2-adapter', :platforms => :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', :platforms => :jruby
+  gem 'activerecord-jdbcmysql-adapter', :platforms => :jruby
 end

data/Gemfile.lock

@@ -24,6 +24,13 @@ GEM
       activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcpostgresql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-postgres (>= 9.0, < 9.2)
     activerecord-mysql2-adapter (0.0.3)
       mysql2
     activerecord-postgresql-adapter (0.0.1)
@@ -40,11 +47,14 @@ GEM
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
+    jdbc-mysql (5.1.13)
+    jdbc-postgres (9.1.901)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.6.5)
+    json (1.6.5-java)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -80,6 +90,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rcov (0.9.11)
+    rcov (0.9.11-java)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.4.0)
@@ -102,9 +113,12 @@ GEM
     tzinfo (0.3.31)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
   activerecord-mysql2-adapter
   activerecord-postgresql-adapter
   bundler

data/README.md

@@ -15,7 +15,7 @@ This is useful because of the following limitations in vanilla Rails:
   
 That last point deserves some elaboration. First, using `add_index` in your migrations is bug-prone because without rare developer discipline, you wind up missing indexes in some environments. (My rule is "never change a migration after a `git push`," but I haven't seen this followed elsewhere, and there is nothing that automatically enforces it.) Also, since missing indexes don't cause errors, it's easy to be missing one and not notice until users start complaining about performance.
 
-Second, scattering `add_index` methods throughout migrations also doesn't match the workflow of optimizing database queries. Hopefully you create appropriate indexes when you set up your tables originally, but in practice you often need to go back later and add/remove indexes according to your database usage patterns. Or you just forget the indexes, because you're thinking about modeling the data, not optimizing the queries.
+Second, scattering `add_index` methods throughout migrations doesn't match the workflow of optimizing database queries. Hopefully you create appropriate indexes when you set up your tables originally, but in practice you often need to go back later and add/remove indexes according to your database usage patterns. Or you just forget the indexes, because you're thinking about modeling the data, not optimizing the queries.
 It's easier to vet and analyze database indexes if you can see them all in one place,
 and db\_leftovers lets you do that easily.
 And since you can rest assured that each environment conforms to the same definition, you don't need to second-guess yourself about indexes that are present in development but missing in production.
@@ -121,7 +121,7 @@ and db\_leftovers will notice the changed expression. It will drop and re-add th
 
 One caveat, however: we pull the current expression from the database, and sometimes Postgres does things like
 add type conversions and extra parentheses. If instance, suppose you said `check :users, :email_length, 'LENGTH(email) > 2'`.
-The second time you run db\_leftovers, it will read the expression from Postgres and get `LENGTH((email)::text) > 2`,
+The second time you run db\_leftovers, it will read the expression from Postgres and get `length((email)::text) > 2`,
 and so it will drop and re-create the constraint.
 It will drop and re-create it every time you run the rake task.
 To get around this, make sure your config file uses the same expression as printed by db\_leftovers in the rake output.
@@ -168,6 +168,14 @@ Known Issues
 * It'd be nice to have another Rake task that will read your database and generate a new `db_leftovers.rb` file, to help people migrating existing projects that already have lots of tables.
 
 
+
+Tests
+-----
+
+Db\_leftovers has three kinds of RSpec tests: tests that run against a mock database, a Postgres database, and a MySQL database. The tests look at `spec/config/database.yml` to see if you've created a test database for Postgres and/or MySQL, and only run those tests if an entry is found there. You can look at `spec/config/database.yml.sample` to get a sense of what is expected and for instructions on setting up your own test databases. If you're contributing a patch, please make sure you've run these tests!
+
+
+
 Contributing to db\_leftovers
 -----------------------------
  

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/db_leftovers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "db_leftovers"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul A. Jungwirth"]
-  s.date = "2012-10-02"
+  s.date = "2012-10-06"
   s.description = "        Define indexes and foreign keys for your Rails app\n        in one place using an easy-to-read DSL,\n        then run a rake task to bring your database up-to-date.\n"
   s.email = "pj@illuminatedcomputing.com"
   s.extra_rdoc_files = [

data/lib/db_leftovers/dsl.rb

@@ -229,7 +229,7 @@ module DBLeftovers
     def get_database_interface
       db = ActiveRecord::Base.configurations[Rails.env]['adapter']
       case db
-      when 'postgresql'
+      when 'postgresql', 'jdbcpostgresql'
         DBLeftovers::PostgresDatabaseInterface.new
       when 'mysql2'
         DBLeftovers::MySQLInterface.new

data/lib/db_leftovers/postgres_database_interface.rb

@@ -58,10 +58,10 @@ module DBLeftovers
       # TODO: Support multi-column foreign keys:
       sql = <<-EOQ
           SELECT  c.conname,
-                  t1.relname,
-                  a1.attname,
-                  t2.relname,
-                  a2.attname,
+                  t1.relname AS from_table,
+                  a1.attname AS from_column,
+                  t2.relname AS to_table,
+                  a2.attname AS to_column,
                   c.confdeltype
           FROM    pg_catalog.pg_constraint c,
                   pg_catalog.pg_class t1,

data/spec/config/database.yml.sample

@@ -25,3 +25,23 @@ mysql:
   password: testdb
   encoding: utf8
 
+# These are used instead of the above if you're running under JRuby:
+
+jdbcpostgres:
+  adapter: jdbcpostgresql
+  host: localhost
+  database: db_leftovers_test
+  username: db_leftovers_test
+  password: testdb
+  encoding: utf8
+  template: template0   # Required for UTF-8 encoding
+
+jdbcmysql:
+  adapter: jdbcmysql
+  host: localhost
+  database: db_leftovers_test
+  username: db_leftovers
+  password: testdb
+  encoding: utf8
+
+

data/spec/mysql_spec.rb

@@ -12,13 +12,17 @@ def drop_all_mysql_tables(conn, database_name)
   conn.execute("SET FOREIGN_KEY_CHECKS = 1")
 end
 
+def mysql_config
+  test_database_yml(RUBY_PLATFORM == 'java' ? 'jdbcmysql' : 'mysql')
+end
+
 describe DBLeftovers::MysqlDatabaseInterface do
 
-  if not test_database_yml('mysql')
+  if not mysql_config
     it "WARN: Skipping MySQL tests because no database found. Use spec/config/database.yml to configure one."
   else
     before do
-      y = test_database_yml('mysql')
+      y = mysql_config
       @conn = test_db_connection(nil, y)
       @db = DBLeftovers::MysqlDatabaseInterface.new(@conn, y['database'])
       drop_all_mysql_tables(@conn, y['database'])

data/spec/postgres_spec.rb

@@ -10,13 +10,17 @@ def drop_all_postgres_tables(conn, database_name)
   end
 end
 
+def postgres_config
+  test_database_yml(RUBY_PLATFORM == 'java' ? 'jdbcpostgres' : 'postgres')
+end
+
 describe DBLeftovers::PostgresDatabaseInterface do
 
-  if not test_database_yml('postgres')
+  if not postgres_config
     it "WARN: Skipping Postgres tests because no database found. Use spec/config/database.yml to configure one."
   else
     before do
-       y = test_database_yml('postgres')
+       y = postgres_config
       @conn = test_db_connection(nil, y)
       @db = DBLeftovers::PostgresDatabaseInterface.new(@conn)
       drop_all_postgres_tables(@conn, y['database'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_leftovers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -672806461406731014
+      hash: 3981883002414035216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: