3 files changed, 9 insertions, 5 deletions
diff --git a/migrate/changeset/databases/firebird.py b/migrate/changeset/databases/firebird.py
index 5eacd58..a8831bf 100644
--- a/migrate/changeset/databases/firebird.py
+++ b/migrate/changeset/databases/firebird.py
@@ -2,11 +2,13 @@
    Firebird database specific implementations of changeset classes.
 """
 
-from migrate.changeset import ansisql, exceptions
-
-# TODO: SQLA 0.6 has not migrated the FB dialect over yet
+from migrate.changeset import ansisql, exceptions, SQLA_06
 from sqlalchemy.databases import firebird as sa_base
-FBSchemaGenerator = sa_base.FBSchemaGenerator
+
+if SQLA_06:
+    FBSchemaGenerator = sa_base.FBDDLCompiler
+else:
+    FBSchemaGenerator = sa_base.FBSchemaGenerator
 
 class FBColumnGenerator(FBSchemaGenerator, ansisql.ANSIColumnGenerator):
     """Firebird column generator implementation."""
diff --git a/migrate/changeset/databases/postgres.py b/migrate/changeset/databases/postgres.py
index 2c36ed1..015ad65 100644
--- a/migrate/changeset/databases/postgres.py
+++ b/migrate/changeset/databases/postgres.py
@@ -4,11 +4,12 @@
    .. _`PostgreSQL`: http://www.postgresql.org/
 """
 from migrate.changeset import ansisql, SQLA_06
-from sqlalchemy.databases import postgres as sa_base
 
 if not SQLA_06:
+    from sqlalchemy.databases import postgres as sa_base
     PGSchemaGenerator = sa_base.PGSchemaGenerator
 else:
+    from sqlalchemy.databases import postgresql as sa_base
     PGSchemaGenerator = sa_base.PGDDLCompiler
 
 
diff --git a/migrate/changeset/databases/visitor.py b/migrate/changeset/databases/visitor.py
index 6db2d51..aa8a3e5 100644
--- a/migrate/changeset/databases/visitor.py
+++ b/migrate/changeset/databases/visitor.py
@@ -16,6 +16,7 @@ DIALECTS = {
     "default": ansisql.ANSIDialect,
     "sqlite": sqlite.SQLiteDialect,
     "postgres": postgres.PGDialect,
+    "postgresql": postgres.PGDialect,
     "mysql": mysql.MySQLDialect,
     "oracle": oracle.OracleDialect,
     "firebird": firebird.FBDialect,