Merge pull request #8 from apeckham/master

Commits to increase test coverage

Author: tardate

lib/mysql2psql/postgres_db_writer.rb

@@ -102,20 +102,7 @@ def write_indexes(table)
       next if index[:primary]
       unique = index[:unique] ? "UNIQUE " : nil
 
-      #MySQL allows an index name which could be equal to a table name, Postgres doesn't
-      indexname = index[:name]
-      if indexname.eql?(table.name)
-        indexnamenew = "#{indexname}_index"
-        puts "WARNING: index \"#{indexname}\" equals table name. This is not allowed by postgres and will be renamed to \"#{indexnamenew}\""
-        indexname = indexnamenew
-      end
-      
-      if @conn.server_version < 80200
-        @conn.exec("DROP INDEX #{PGconn.quote_ident(indexname)} CASCADE;") if exists?(indexname)
-      else
-        @conn.exec("DROP INDEX IF EXISTS #{PGconn.quote_ident(indexname)} CASCADE;")
-      end
-      @conn.exec("CREATE #{unique}INDEX #{PGconn.quote_ident(indexname)} ON #{PGconn.quote_ident(table.name)} (#{index[:columns].map {|col| PGconn.quote_ident(col)}.join(", ")});")
+      @conn.exec("CREATE #{unique}INDEX ON #{PGconn.quote_ident(table.name)} (#{index[:columns].map {|col| PGconn.quote_ident(col)}.join(", ")});")
     end
 
 

test/integration/convert_to_db_test.rb

@@ -102,7 +102,7 @@ def test_datetime_defaults
 
   def test_index_conversion
     result = exec_sql_on_psql('SELECT pg_get_indexdef(indexrelid) FROM pg_index WHERE indrelid = \'test_index_conversion\'::regclass').first
-    assert_equal "CREATE UNIQUE INDEX test_index_conversion_index ON test_index_conversion USING btree (column_a)", result["pg_get_indexdef"]
+    assert_equal "CREATE UNIQUE INDEX test_index_conversion_column_a_idx ON test_index_conversion USING btree (column_a)", result["pg_get_indexdef"]
   end
 
   def test_foreign_keys