Omar Belkhodja fixes

angel_orm_generator/lib/src/migration_generator.dart

@@ -86,7 +86,17 @@ class MigrationGenerator extends GeneratorForAnnotation<Orm> {
               if (dup.contains(key))
                 return;
               else {
-                if (key != 'id' || autoIdAndDateFields == false) {
+                // if (key != 'id' || autoIdAndDateFields == false) {
+                //   // Check for relationships that might duplicate
+                //   for (var rName in ctx.relations.keys) {
+                //     var relationship = ctx.relations[rName];
+                //     if (relationship.localKey == key) return;
+                //   }
+                // }
+
+                // Fix from: https://github.com/angel-dart/angel/issues/114#issuecomment-505525729
+                if (!(col.indexType == IndexType.primaryKey ||
+                    (autoIdAndDateFields != false && name == 'id'))) {
                   // Check for relationships that might duplicate
                   for (var rName in ctx.relations.keys) {
                     var relationship = ctx.relations[rName];
@@ -225,10 +235,23 @@ class MigrationGenerator extends GeneratorForAnnotation<Orm> {
               var relationship = r;
 
               if (relationship.type == RelationshipType.belongsTo) {
-                var key = relationship.localKey;
+                // Fix from https://github.com/angel-dart/angel/issues/116#issuecomment-505546479
+                // var key = relationship.localKey;
+
+                // var field = table.property('integer').call([literal(key)]);
+                // // .references('user', 'id').onDeleteCascade()
+                var columnTypeType = refer('ColumnType');
+                var key = relationship.localKey;
+                var keyType = relationship
+                    .foreign.columns[relationship.foreignKey].type.name;
+
+                var field = table.property('declare').call([
+                  literal(key),
+                  columnTypeType.newInstance([
+                    literal(keyType),
+                  ])
+                ]);
 
-                var field = table.property('integer').call([literal(key)]);
-                // .references('user', 'id').onDeleteCascade()
                 var ref = field.property('references').call([
                   literal(relationship.foreignTable),
                   literal(relationship.foreignKey),

angel_orm_generator/lib/src/orm_build_context.dart

@@ -153,9 +153,10 @@ Future<OrmBuildContext> buildOrmContext(
         // if (!isModelClass(field.type) &&
         //     !(field.type is InterfaceType &&
         //         isListOfModelType(field.type as InterfaceType))) {
-        if (!(field.type is InterfaceType &&
-                isListOfModelType(field.type as InterfaceType)) &&
-            !isModelClass(field.type)) {
+        var canUse = (field.type is InterfaceType &&
+                isListOfModelType(field.type as InterfaceType)) ||
+            isModelClass(field.type);
+        if (!canUse) {
           throw new UnsupportedError(
               'Cannot apply relationship to field "${field.name}" - ${field.type} is not assignable to Model.');
         } else {

angel_orm_test/lib/src/models/book.g.dart

@@ -14,8 +14,12 @@ class BookMigration extends Migration {
       table.timeStamp('created_at');
       table.timeStamp('updated_at');
       table.varChar('name');
-      table.integer('author_id').references('authors', 'id');
-      table.integer('partner_author_id').references('authors', 'id');
+      table
+          .declare('author_id', ColumnType('serial'))
+          .references('authors', 'id');
+      table
+          .declare('partner_author_id', ColumnType('serial'))
+          .references('authors', 'id');
     });
   }
 

angel_orm_test/lib/src/models/email_indexed.dart

@@ -0,0 +1,39 @@
+import 'package:angel_migration/angel_migration.dart';
+import 'package:angel_model/angel_model.dart';
+import 'package:angel_orm/angel_orm.dart';
+import 'package:angel_serialize/angel_serialize.dart';
+part 'email_indexed.g.dart';
+
+// * https://github.com/angel-dart/angel/issues/116
+
+@serializable
+@orm
+abstract class _Role {
+  @PrimaryKey(columnType: ColumnType.varChar)
+  String get role;
+
+  @ManyToMany(_RoleUser)
+  List<_User> get users;
+}
+
+@serializable
+@orm
+abstract class _RoleUser {
+  @belongsTo
+  _Role get role;
+
+  @belongsTo
+  _User get user;
+}
+
+@serializable
+@orm
+abstract class _User {
+  @PrimaryKey(columnType: ColumnType.varChar)
+  String get email;  
+  String get name;
+  String get password;
+
+  @ManyToMany(_RoleUser)
+  List<_Role> get roles;
+}

angel_orm_test/lib/src/models/email_indexed.g.dart

@@ -0,0 +1,769 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'email_indexed.dart';
+
+// **************************************************************************
+// MigrationGenerator
+// **************************************************************************
+
+class RoleMigration extends Migration {
+  @override
+  up(Schema schema) {
+    schema.create('roles', (table) {
+      table.declare('role', ColumnType('varchar'))..primaryKey();
+    });
+  }
+
+  @override
+  down(Schema schema) {
+    schema.drop('roles', cascade: true);
+  }
+}
+
+class RoleUserMigration extends Migration {
+  @override
+  up(Schema schema) {
+    schema.create('role_users', (table) {
+      table
+          .declare('role_role', ColumnType('varchar'))
+          .references('roles', 'role');
+      table
+          .declare('user_email', ColumnType('varchar'))
+          .references('users', 'email');
+    });
+  }
+
+  @override
+  down(Schema schema) {
+    schema.drop('role_users');
+  }
+}
+
+class UserMigration extends Migration {
+  @override
+  up(Schema schema) {
+    schema.create('users', (table) {
+      table.declare('email', ColumnType('varchar'))..primaryKey();
+      table.varChar('name');
+      table.varChar('password');
+    });
+  }
+
+  @override
+  down(Schema schema) {
+    schema.drop('users', cascade: true);
+  }
+}
+
+// **************************************************************************
+// OrmGenerator
+// **************************************************************************
+
+class RoleQuery extends Query<Role, RoleQueryWhere> {
+  RoleQuery({Set<String> trampoline}) {
+    trampoline ??= Set();
+    trampoline.add(tableName);
+    _where = RoleQueryWhere(this);
+    leftJoin(RoleUserQuery(trampoline: trampoline), 'role', 'role_role',
+        additionalFields: const ['email', 'name', 'password'],
+        trampoline: trampoline);
+  }
+
+  @override
+  final RoleQueryValues values = RoleQueryValues();
+
+  RoleQueryWhere _where;
+
+  @override
+  get casts {
+    return {};
+  }
+
+  @override
+  get tableName {
+    return 'roles';
+  }
+
+  @override
+  get fields {
+    return const ['role'];
+  }
+
+  @override
+  RoleQueryWhere get where {
+    return _where;
+  }
+
+  @override
+  RoleQueryWhere newWhereClause() {
+    return RoleQueryWhere(this);
+  }
+
+  static Role parseRow(List row) {
+    if (row.every((x) => x == null)) return null;
+    var model = Role(role: (row[0] as String));
+    if (row.length > 1) {
+      model = model.copyWith(
+          users: [UserQuery.parseRow(row.skip(1).take(3).toList())]
+              .where((x) => x != null)
+              .toList());
+    }
+    return model;
+  }
+
+  @override
+  deserialize(List row) {
+    return parseRow(row);
+  }
+
+  @override
+  bool canCompile(trampoline) {
+    return (!(trampoline.contains('roles') &&
+        trampoline.contains('role_users')));
+  }
+
+  @override
+  get(QueryExecutor executor) {
+    return super.get(executor).then((result) {
+      return result.fold<List<Role>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.role == model.role);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                users: List<_User>.from(l.users ?? [])
+                  ..addAll(model.users ?? []));
+        }
+      });
+    });
+  }
+
+  @override
+  update(QueryExecutor executor) {
+    return super.update(executor).then((result) {
+      return result.fold<List<Role>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.role == model.role);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                users: List<_User>.from(l.users ?? [])
+                  ..addAll(model.users ?? []));
+        }
+      });
+    });
+  }
+
+  @override
+  delete(QueryExecutor executor) {
+    return super.delete(executor).then((result) {
+      return result.fold<List<Role>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.role == model.role);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                users: List<_User>.from(l.users ?? [])
+                  ..addAll(model.users ?? []));
+        }
+      });
+    });
+  }
+}
+
+class RoleQueryWhere extends QueryWhere {
+  RoleQueryWhere(RoleQuery query)
+      : role = StringSqlExpressionBuilder(query, 'role');
+
+  final StringSqlExpressionBuilder role;
+
+  @override
+  get expressionBuilders {
+    return [role];
+  }
+}
+
+class RoleQueryValues extends MapQueryValues {
+  @override
+  get casts {
+    return {};
+  }
+
+  String get role {
+    return (values['role'] as String);
+  }
+
+  set role(String value) => values['role'] = value;
+  void copyFrom(Role model) {
+    role = model.role;
+  }
+}
+
+class RoleUserQuery extends Query<RoleUser, RoleUserQueryWhere> {
+  RoleUserQuery({Set<String> trampoline}) {
+    trampoline ??= Set();
+    trampoline.add(tableName);
+    _where = RoleUserQueryWhere(this);
+    leftJoin('roles', 'role_role', 'role',
+        additionalFields: const ['role'], trampoline: trampoline);
+    leftJoin('users', 'user_email', 'email',
+        additionalFields: const ['email', 'name', 'password'],
+        trampoline: trampoline);
+  }
+
+  @override
+  final RoleUserQueryValues values = RoleUserQueryValues();
+
+  RoleUserQueryWhere _where;
+
+  @override
+  get casts {
+    return {};
+  }
+
+  @override
+  get tableName {
+    return 'role_users';
+  }
+
+  @override
+  get fields {
+    return const ['role_role', 'user_email'];
+  }
+
+  @override
+  RoleUserQueryWhere get where {
+    return _where;
+  }
+
+  @override
+  RoleUserQueryWhere newWhereClause() {
+    return RoleUserQueryWhere(this);
+  }
+
+  static RoleUser parseRow(List row) {
+    if (row.every((x) => x == null)) return null;
+    var model = RoleUser();
+    if (row.length > 2) {
+      model = model.copyWith(
+          role: RoleQuery.parseRow(row.skip(2).take(1).toList()));
+    }
+    if (row.length > 3) {
+      model = model.copyWith(
+          user: UserQuery.parseRow(row.skip(3).take(3).toList()));
+    }
+    return model;
+  }
+
+  @override
+  deserialize(List row) {
+    return parseRow(row);
+  }
+}
+
+class RoleUserQueryWhere extends QueryWhere {
+  RoleUserQueryWhere(RoleUserQuery query)
+      : roleRole = StringSqlExpressionBuilder(query, 'role_role'),
+        userEmail = StringSqlExpressionBuilder(query, 'user_email');
+
+  final StringSqlExpressionBuilder roleRole;
+
+  final StringSqlExpressionBuilder userEmail;
+
+  @override
+  get expressionBuilders {
+    return [roleRole, userEmail];
+  }
+}
+
+class RoleUserQueryValues extends MapQueryValues {
+  @override
+  get casts {
+    return {};
+  }
+
+  String get roleRole {
+    return (values['role_role'] as String);
+  }
+
+  set roleRole(String value) => values['role_role'] = value;
+  String get userEmail {
+    return (values['user_email'] as String);
+  }
+
+  set userEmail(String value) => values['user_email'] = value;
+  void copyFrom(RoleUser model) {
+    if (model.role != null) {
+      values['role_role'] = model.role.role;
+    }
+    if (model.user != null) {
+      values['user_email'] = model.user.email;
+    }
+  }
+}
+
+class UserQuery extends Query<User, UserQueryWhere> {
+  UserQuery({Set<String> trampoline}) {
+    trampoline ??= Set();
+    trampoline.add(tableName);
+    _where = UserQueryWhere(this);
+    leftJoin(RoleUserQuery(trampoline: trampoline), 'email', 'user_email',
+        additionalFields: const ['role'], trampoline: trampoline);
+  }
+
+  @override
+  final UserQueryValues values = UserQueryValues();
+
+  UserQueryWhere _where;
+
+  @override
+  get casts {
+    return {};
+  }
+
+  @override
+  get tableName {
+    return 'users';
+  }
+
+  @override
+  get fields {
+    return const ['email', 'name', 'password'];
+  }
+
+  @override
+  UserQueryWhere get where {
+    return _where;
+  }
+
+  @override
+  UserQueryWhere newWhereClause() {
+    return UserQueryWhere(this);
+  }
+
+  static User parseRow(List row) {
+    if (row.every((x) => x == null)) return null;
+    var model = User(
+        email: (row[0] as String),
+        name: (row[1] as String),
+        password: (row[2] as String));
+    if (row.length > 3) {
+      model = model.copyWith(
+          roles: [RoleQuery.parseRow(row.skip(3).take(1).toList())]
+              .where((x) => x != null)
+              .toList());
+    }
+    return model;
+  }
+
+  @override
+  deserialize(List row) {
+    return parseRow(row);
+  }
+
+  @override
+  bool canCompile(trampoline) {
+    return (!(trampoline.contains('users') &&
+        trampoline.contains('role_users')));
+  }
+
+  @override
+  get(QueryExecutor executor) {
+    return super.get(executor).then((result) {
+      return result.fold<List<User>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.email == model.email);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                roles: List<_Role>.from(l.roles ?? [])
+                  ..addAll(model.roles ?? []));
+        }
+      });
+    });
+  }
+
+  @override
+  update(QueryExecutor executor) {
+    return super.update(executor).then((result) {
+      return result.fold<List<User>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.email == model.email);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                roles: List<_Role>.from(l.roles ?? [])
+                  ..addAll(model.roles ?? []));
+        }
+      });
+    });
+  }
+
+  @override
+  delete(QueryExecutor executor) {
+    return super.delete(executor).then((result) {
+      return result.fold<List<User>>([], (out, model) {
+        var idx = out.indexWhere((m) => m.email == model.email);
+
+        if (idx == -1) {
+          return out..add(model);
+        } else {
+          var l = out[idx];
+          return out
+            ..[idx] = l.copyWith(
+                roles: List<_Role>.from(l.roles ?? [])
+                  ..addAll(model.roles ?? []));
+        }
+      });
+    });
+  }
+}
+
+class UserQueryWhere extends QueryWhere {
+  UserQueryWhere(UserQuery query)
+      : email = StringSqlExpressionBuilder(query, 'email'),
+        name = StringSqlExpressionBuilder(query, 'name'),
+        password = StringSqlExpressionBuilder(query, 'password');
+
+  final StringSqlExpressionBuilder email;
+
+  final StringSqlExpressionBuilder name;
+
+  final StringSqlExpressionBuilder password;
+
+  @override
+  get expressionBuilders {
+    return [email, name, password];
+  }
+}
+
+class UserQueryValues extends MapQueryValues {
+  @override
+  get casts {
+    return {};
+  }
+
+  String get email {
+    return (values['email'] as String);
+  }
+
+  set email(String value) => values['email'] = value;
+  String get name {
+    return (values['name'] as String);
+  }
+
+  set name(String value) => values['name'] = value;
+  String get password {
+    return (values['password'] as String);
+  }
+
+  set password(String value) => values['password'] = value;
+  void copyFrom(User model) {
+    email = model.email;
+    name = model.name;
+    password = model.password;
+  }
+}
+
+// **************************************************************************
+// JsonModelGenerator
+// **************************************************************************
+
+@generatedSerializable
+class Role implements _Role {
+  const Role({this.role, this.users});
+
+  @override
+  final String role;
+
+  @override
+  final List<_User> users;
+
+  Role copyWith({String role, List<_User> users}) {
+    return Role(role: role ?? this.role, users: users ?? this.users);
+  }
+
+  bool operator ==(other) {
+    return other is _Role &&
+        other.role == role &&
+        ListEquality<_User>(DefaultEquality<_User>())
+            .equals(other.users, users);
+  }
+
+  @override
+  int get hashCode {
+    return hashObjects([role, users]);
+  }
+
+  @override
+  String toString() {
+    return "Role(role=$role, users=$users)";
+  }
+
+  Map<String, dynamic> toJson() {
+    return RoleSerializer.toMap(this);
+  }
+}
+
+@generatedSerializable
+class RoleUser implements _RoleUser {
+  const RoleUser({this.role, this.user});
+
+  @override
+  final _Role role;
+
+  @override
+  final _User user;
+
+  RoleUser copyWith({_Role role, _User user}) {
+    return RoleUser(role: role ?? this.role, user: user ?? this.user);
+  }
+
+  bool operator ==(other) {
+    return other is _RoleUser && other.role == role && other.user == user;
+  }
+
+  @override
+  int get hashCode {
+    return hashObjects([role, user]);
+  }
+
+  @override
+  String toString() {
+    return "RoleUser(role=$role, user=$user)";
+  }
+
+  Map<String, dynamic> toJson() {
+    return RoleUserSerializer.toMap(this);
+  }
+}
+
+@generatedSerializable
+class User implements _User {
+  const User({this.email, this.name, this.password, this.roles});
+
+  @override
+  final String email;
+
+  @override
+  final String name;
+
+  @override
+  final String password;
+
+  @override
+  final List<_Role> roles;
+
+  User copyWith(
+      {String email, String name, String password, List<_Role> roles}) {
+    return User(
+        email: email ?? this.email,
+        name: name ?? this.name,
+        password: password ?? this.password,
+        roles: roles ?? this.roles);
+  }
+
+  bool operator ==(other) {
+    return other is _User &&
+        other.email == email &&
+        other.name == name &&
+        other.password == password &&
+        ListEquality<_Role>(DefaultEquality<_Role>())
+            .equals(other.roles, roles);
+  }
+
+  @override
+  int get hashCode {
+    return hashObjects([email, name, password, roles]);
+  }
+
+  @override
+  String toString() {
+    return "User(email=$email, name=$name, password=$password, roles=$roles)";
+  }
+
+  Map<String, dynamic> toJson() {
+    return UserSerializer.toMap(this);
+  }
+}
+
+// **************************************************************************
+// SerializerGenerator
+// **************************************************************************
+
+const RoleSerializer roleSerializer = RoleSerializer();
+
+class RoleEncoder extends Converter<Role, Map> {
+  const RoleEncoder();
+
+  @override
+  Map convert(Role model) => RoleSerializer.toMap(model);
+}
+
+class RoleDecoder extends Converter<Map, Role> {
+  const RoleDecoder();
+
+  @override
+  Role convert(Map map) => RoleSerializer.fromMap(map);
+}
+
+class RoleSerializer extends Codec<Role, Map> {
+  const RoleSerializer();
+
+  @override
+  get encoder => const RoleEncoder();
+  @override
+  get decoder => const RoleDecoder();
+  static Role fromMap(Map map) {
+    return Role(
+        role: map['role'] as String,
+        users: map['users'] is Iterable
+            ? List.unmodifiable(((map['users'] as Iterable).whereType<Map>())
+                .map(UserSerializer.fromMap))
+            : null);
+  }
+
+  static Map<String, dynamic> toMap(_Role model) {
+    if (model == null) {
+      return null;
+    }
+    return {
+      'role': model.role,
+      'users': model.users?.map((m) => UserSerializer.toMap(m))?.toList()
+    };
+  }
+}
+
+abstract class RoleFields {
+  static const List<String> allFields = <String>[role, users];
+
+  static const String role = 'role';
+
+  static const String users = 'users';
+}
+
+const RoleUserSerializer roleUserSerializer = RoleUserSerializer();
+
+class RoleUserEncoder extends Converter<RoleUser, Map> {
+  const RoleUserEncoder();
+
+  @override
+  Map convert(RoleUser model) => RoleUserSerializer.toMap(model);
+}
+
+class RoleUserDecoder extends Converter<Map, RoleUser> {
+  const RoleUserDecoder();
+
+  @override
+  RoleUser convert(Map map) => RoleUserSerializer.fromMap(map);
+}
+
+class RoleUserSerializer extends Codec<RoleUser, Map> {
+  const RoleUserSerializer();
+
+  @override
+  get encoder => const RoleUserEncoder();
+  @override
+  get decoder => const RoleUserDecoder();
+  static RoleUser fromMap(Map map) {
+    return RoleUser(
+        role: map['role'] != null
+            ? RoleSerializer.fromMap(map['role'] as Map)
+            : null,
+        user: map['user'] != null
+            ? UserSerializer.fromMap(map['user'] as Map)
+            : null);
+  }
+
+  static Map<String, dynamic> toMap(_RoleUser model) {
+    if (model == null) {
+      return null;
+    }
+    return {
+      'role': RoleSerializer.toMap(model.role),
+      'user': UserSerializer.toMap(model.user)
+    };
+  }
+}
+
+abstract class RoleUserFields {
+  static const List<String> allFields = <String>[role, user];
+
+  static const String role = 'role';
+
+  static const String user = 'user';
+}
+
+const UserSerializer userSerializer = UserSerializer();
+
+class UserEncoder extends Converter<User, Map> {
+  const UserEncoder();
+
+  @override
+  Map convert(User model) => UserSerializer.toMap(model);
+}
+
+class UserDecoder extends Converter<Map, User> {
+  const UserDecoder();
+
+  @override
+  User convert(Map map) => UserSerializer.fromMap(map);
+}
+
+class UserSerializer extends Codec<User, Map> {
+  const UserSerializer();
+
+  @override
+  get encoder => const UserEncoder();
+  @override
+  get decoder => const UserDecoder();
+  static User fromMap(Map map) {
+    return User(
+        email: map['email'] as String,
+        name: map['name'] as String,
+        password: map['password'] as String,
+        roles: map['roles'] is Iterable
+            ? List.unmodifiable(((map['roles'] as Iterable).whereType<Map>())
+                .map(RoleSerializer.fromMap))
+            : null);
+  }
+
+  static Map<String, dynamic> toMap(_User model) {
+    if (model == null) {
+      return null;
+    }
+    return {
+      'email': model.email,
+      'name': model.name,
+      'password': model.password,
+      'roles': model.roles?.map((m) => RoleSerializer.toMap(m))?.toList()
+    };
+  }
+}
+
+abstract class UserFields {
+  static const List<String> allFields = <String>[email, name, password, roles];
+
+  static const String email = 'email';
+
+  static const String name = 'name';
+
+  static const String password = 'password';
+
+  static const String roles = 'roles';
+}

angel_orm_test/lib/src/models/order.g.dart

@@ -16,7 +16,9 @@ class OrderMigration extends Migration {
       table.integer('employee_id');
       table.timeStamp('order_date');
       table.integer('shipper_id');
-      table.integer('customer_id').references('customers', 'id');
+      table
+          .declare('customer_id', ColumnType('serial'))
+          .references('customers', 'id');
     });
   }
 

angel_orm_test/lib/src/models/unorthodox.g.dart

@@ -24,7 +24,10 @@ class WeirdJoinMigration extends Migration {
   @override
   up(Schema schema) {
     schema.create('weird_joins', (table) {
-      table.integer('join_name').references('unorthodoxes', 'name');
+      table.declare('id', ColumnType('serial'))..primaryKey();
+      table
+          .declare('join_name', ColumnType('varchar'))
+          .references('unorthodoxes', 'name');
     });
   }
 
@@ -70,7 +73,9 @@ class NumbaMigration extends Migration {
 class FooMigration extends Migration {
   @override
   up(Schema schema) {
-    schema.create('foos', (table) {});
+    schema.create('foos', (table) {
+      table.declare('bar', ColumnType('serial'))..primaryKey();
+    });
   }
 
   @override
@@ -83,8 +88,10 @@ class FooPivotMigration extends Migration {
   @override
   up(Schema schema) {
     schema.create('foo_pivots', (table) {
-      table.integer('weird_join_id').references('weird_joins', 'id');
-      table.integer('foo_bar').references('foos', 'bar');
+      table
+          .declare('weird_join_id', ColumnType('serial'))
+          .references('weird_joins', 'id');
+      table.declare('foo_bar', ColumnType('serial')).references('foos', 'bar');
     });
   }
 

angel_orm_test/lib/src/models/user.g.dart

@@ -29,8 +29,8 @@ class RoleUserMigration extends Migration {
   @override
   up(Schema schema) {
     schema.create('role_users', (table) {
-      table.integer('role_id').references('roles', 'id');
-      table.integer('user_id').references('users', 'id');
+      table.declare('role_id', ColumnType('serial')).references('roles', 'id');
+      table.declare('user_id', ColumnType('serial')).references('users', 'id');
     });
   }