Fixed reset and rollback and table name

Fixed table name, now shows name of the table instead of index. Drop foreign is no longer useful?

Author: VeeeneX

export-laravel-5-migrations.py

@@ -379,52 +379,53 @@ def export_schema(out, schema, is_main_schema, table_tree):
 
                     migrations[ti].append(migrationDownTemplate)
 
-                    first_foreign_created = False
-                    for fkey in tbl.foreignKeys:
-                        if fkey.name != '':
-                            if fkey.referencedColumns[0].owner.name in migration_tables or tbl.indices:
-                                if not first_foreign_created:
-                                    migrations[ti].append(
-                                        schemaCreateTemplate.format(tableName=tbl.name)
-                                    )
-                                    first_foreign_created = True
-
-                                migrations[ti].append(
-                                    "            $table->dropForeign('{key}');\n".format(key=fkey.columns[0].name))
-
-                    if first_foreign_created:
-                        migrations[ti].append("        });\n")
-                        migrations[ti].append('\n')
-
-                    for fkey, fval in foreign_keys.iteritems():
-                        if fkey == table.name:
-                            keyed_tables = []
-                            schema_table = 0
-                            for item in fval:
-                                if item['table'] not in keyed_tables:
-                                    keyed_tables.append(item['table'])
-
-                                    if schema_table == 0:
-                                        foreign_table_name = item['table']
-                                        migrations[table.name].append('\n')
-                                        migrations[table.name].append(
-                                            '        Schema::table(\'%s\', function (Blueprint $table) {\n' % (item['table']))
-                                        schema_table = 1
-
-                                    elif foreign_table_name != item['table']:
-                                        foreign_table_name = item['table']
-                                        migrations[table.name].append("        });\n")
-                                        migrations[table.name].append('\n')
-                                        migrations[table.name].append(
-                                            '        Schema::table(\'%s\', function (Blueprint $table) {\n' % (item['table']))
-
-                                    migrations[table.name].append(
-                                        "            $table->dropForeign('{key}');\n".format(key=item['name'])
-                                    )
-
-                            if schema_table == 1:
-                                migrations[table.name].append("        });\n")
-                                migrations[table.name].append('\n')
+                    # Not needed?
+                    # first_foreign_created = False
+                    # for fkey in tbl.foreignKeys:
+                    #     if fkey.name != '':
+                    #         if fkey.referencedColumns[0].owner.name in migration_tables or tbl.indices:
+                    #             if not first_foreign_created:
+                    #                 migrations[ti].append(
+                    #                     schemaCreateTemplate.format(tableName=tbl.name)
+                    #                 )
+                    #                 first_foreign_created = True
+                    #
+                    #             migrations[ti].append(
+                    #                 "            $table->dropForeign('{key}');\n".format(key=fkey.columns[0].name))
+                    #
+                    # if first_foreign_created:
+                    #     migrations[ti].append("        });\n")
+                    #     migrations[ti].append('\n')
+                    #
+                    # for fkey, fval in foreign_keys.iteritems():
+                    #     if fkey == table.name:
+                    #         keyed_tables = []
+                    #         schema_table = 0
+                    #         for item in fval:
+                    #             if item['table'] not in keyed_tables:
+                    #                 keyed_tables.append(item['table'])
+                    #
+                    #                 if schema_table == 0:
+                    #                     foreign_table_name = item['table']
+                    #                     migrations[table.name].append('\n')
+                    #                     migrations[table.name].append(
+                    #                         '        Schema::table(\'%s\', function (Blueprint $table) {\n' % (item['table']))
+                    #                     schema_table = 1
+                    #
+                    #                 elif foreign_table_name != item['table']:
+                    #                     foreign_table_name = item['table']
+                    #                     migrations[table.name].append("        });\n")
+                    #                     migrations[table.name].append('\n')
+                    #                     migrations[table.name].append(
+                    #                         '        Schema::table(\'%s\', function (Blueprint $table) {\n' % (item['table']))
+                    #
+                    #                 migrations[table.name].append(
+                    #                     "            $table->dropForeign('{key}');\n".format(key=item['name'])
+                    #                 )
+                    #
+                    #         if schema_table == 1:
+                    #             migrations[table.name].append("        });\n")
+                    #             migrations[table.name].append('\n')
 
                     migrations[ti].append(migrationEndingTemplate.format(tableName=table_name))
                     ti += 1
@@ -443,7 +444,7 @@ def export_schema(out, schema, is_main_schema, table_tree):
         return 1
 
     for name in sorted(migrations):
-        out.write('Table name: {0}\n\n\n'.format(name))
+        out.write('Table name: {0}\n\n\n'.format(migration_tables[mkey]))
         out.write(''.join(migrations[name]))
         out.write('\n\n\n'.format(name))