Parse default expressions

moor/test/select_test.dart

@@ -68,7 +68,8 @@ void main() {
 
     test('with aliased tables', () async {
       final users = db.alias(db.users, 'u');
-      await (db.select(users)..where((u) => u.id.isSmallerThan(Constant(5))))
+      await (db.select(users)
+            ..where((u) => u.id.isSmallerThan(const Constant(5))))
           .get();
 
       verify(executor.runSelect('SELECT * FROM users u WHERE id < 5;', []));

moor_generator/lib/src/model/specified_column.dart

@@ -1,3 +1,4 @@
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:built_value/built_value.dart';
 
 part 'specified_column.g.dart';
@@ -58,6 +59,11 @@ class SpecifiedColumn {
   /// default ones.
   final String customConstraints;
 
+  /// If a default expression has been provided as the argument of
+  /// ColumnBuilder.withDefault, contains the Dart code that references that
+  /// expression.
+  final Expression defaultArgument;
+
   /// The dart type that matches the values of this column. For instance, if a
   /// table has declared an `IntColumn`, the matching dart type name would be [int].
   String get dartTypeName => {
@@ -108,6 +114,7 @@ class SpecifiedColumn {
     this.declaredAsPrimaryKey = false,
     this.nullable = false,
     this.features = const [],
+    this.defaultArgument,
   });
 }
 

moor_generator/lib/src/parser/column_parser.dart

@@ -14,15 +14,16 @@ const String startBlob = 'blob';
 final Set<String> starters =
     {startInt, startString, startBool, startDateTime, startBlob};
 
-const String functionNamed = 'named';
-const String functionPrimaryKey = 'primaryKey';
-const String functionReferences = 'references';
-const String functionAutoIncrement = 'autoIncrement';
-const String functionWithLength = 'withLength';
-const String functionNullable = 'nullable';
-const String functionCustomConstraint = 'customConstraint';
+const String _methodNamed = 'named';
+const String _methodPrimaryKey = 'primaryKey';
+const String _methodReferences = 'references';
+const String _methodAutoIncrement = 'autoIncrement';
+const String _methodWithLength = 'withLength';
+const String _methodNullable = 'nullable';
+const String _methodCustomConstraint = 'customConstraint';
+const String _methodDefault = 'withDefault';
 
-const String errorMessage = 'This getter does not create a valid column that '
+const String _errorMessage = 'This getter does not create a valid column that '
     'can be parsed by moor. Please refer to the readme from moor to see how '
     'columns are formed. If you have any questions, feel free to raise an issue.';
 
@@ -44,7 +45,7 @@ class ColumnParser extends ParserBase {
     if (!(expr is FunctionExpressionInvocation)) {
       generator.errors.add(MoorError(
         affectedElement: getter.declaredElement,
-        message: errorMessage,
+        message: _errorMessage,
         critical: true,
       ));
 
@@ -57,9 +58,10 @@ class ColumnParser extends ParserBase {
     String foundStartMethod;
     String foundExplicitName;
     String foundCustomConstraint;
+    Expression foundDefaultExpression;
     var wasDeclaredAsPrimaryKey = false;
     var nullable = false;
-    // todo parse reference
+
     final foundFeatures = <ColumnFeature>[];
 
     while (true) {
@@ -71,7 +73,7 @@ class ColumnParser extends ParserBase {
       }
 
       switch (methodName) {
-        case functionNamed:
+        case _methodNamed:
           if (foundExplicitName != null) {
             generator.errors.add(
               MoorError(
@@ -97,12 +99,12 @@ class ColumnParser extends ParserBase {
             );
           });
           break;
-        case functionPrimaryKey:
+        case _methodPrimaryKey:
           wasDeclaredAsPrimaryKey = true;
           break;
-        case functionReferences:
+        case _methodReferences:
           break;
-        case functionWithLength:
+        case _methodWithLength:
           final args = remainingExpr.argumentList;
           final minArg = findNamedArgument(args, 'min');
           final maxArg = findNamedArgument(args, 'max');
@@ -112,14 +114,14 @@ class ColumnParser extends ParserBase {
             max: readIntLiteral(maxArg, () {}),
           ));
           break;
-        case functionAutoIncrement:
+        case _methodAutoIncrement:
           wasDeclaredAsPrimaryKey = true;
           foundFeatures.add(AutoIncrement());
           break;
-        case functionNullable:
+        case _methodNullable:
           nullable = true;
           break;
-        case functionCustomConstraint:
+        case _methodCustomConstraint:
           foundCustomConstraint =
               readStringLiteral(remainingExpr.argumentList.arguments.first, () {
             generator.errors.add(
@@ -133,6 +135,10 @@ class ColumnParser extends ParserBase {
             );
           });
           break;
+        case _methodDefault:
+          final args = remainingExpr.argumentList;
+          final expression = args.arguments.single;
+          foundDefaultExpression = expression;
       }
 
       // We're not at a starting method yet, so we need to go deeper!
@@ -154,7 +160,9 @@ class ColumnParser extends ParserBase {
       declaredAsPrimaryKey: wasDeclaredAsPrimaryKey,
       customConstraints: foundCustomConstraint,
       nullable: nullable,
-        features: foundFeatures);
+      features: foundFeatures,
+      defaultArgument: foundDefaultExpression,
+    );
   }
 
   ColumnType _startMethodToColumnType(String startMethod) {

moor_generator/test/parser/parser_test.dart

@@ -25,6 +25,8 @@ void main() async {
        IntColumn get id => integer().autoIncrement()();
        TextColumn get name => text().named("user_name").withLength(min: 6, max: 32)();
        TextColumn get onlyMax => text().withLength(max: 100)();
+       
+       DateTimeColumn get defaults => dateTime().withDefault(currentDate)();
      }
      
      class CustomPrimaryKey extends Table {
@@ -122,6 +124,13 @@ void main() async {
       expect(partB.customConstraints, 'custom');
       expect(partA.customConstraints, isNull);
     });
+
+    test('parsed default values', () {
+      final table = TableParser(generator).parse(testLib.getType('Users'));
+      final defaultsColumn = table.columns.singleWhere((c) => c.name.name == 'defaults');
+
+      expect(defaultsColumn.defaultArgument.toString(), 'currentDate');
+    });
   });
 
   test('parses custom primary keys', () {