release readiness?

.idea/libraries/Dart_Packages.xml

@@ -80,7 +80,7 @@
           <value>
             <list>
               <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.3/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.7/lib" />
               <option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/build_runner-1.1.3/lib" />
             </list>
           </value>
@@ -667,7 +667,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_resolvers-0.2.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_resolvers-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner_core-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner_core-2.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_test-0.10.6/lib" />

.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/sally_flutter/example/example.iml" filepath="$PROJECT_DIR$/sally_flutter/example/example.iml" />
       <module fileurl="file://$PROJECT_DIR$/sally/sally.iml" filepath="$PROJECT_DIR$/sally/sally.iml" />
       <module fileurl="file://$PROJECT_DIR$/sally_flutter/sally_flutter.iml" filepath="$PROJECT_DIR$/sally_flutter/sally_flutter.iml" />
       <module fileurl="file://$PROJECT_DIR$/sally_generator/sally_generator.iml" filepath="$PROJECT_DIR$/sally_generator/sally_generator.iml" />

README.md

@@ -1 +0,0 @@
-sally/README.md

README.md

@@ -0,0 +1,259 @@
+# Sally
+[![Build Status](https://travis-ci.com/simolus3/sally.svg?token=u4VnFEE5xnWVvkE6QsqL&branch=master)](https://travis-ci.com/simolus3/sally)
+
+Sally is an easy to use and safe way to persist data for Flutter apps. It features
+a fluent Dart DSL to describe tables and will generate matching database code that
+can be used to easily read and store your app's data. It also features a reactive
+API that will deliver auto-updating streams for your queries.
+
+- [Sally](#sally)
+  * [Getting started](#getting-started)
+    + [Adding the dependency](#adding-the-dependency)
+    + [Declaring tables](#declaring-tables)
+    + [Generating the code](#generating-the-code)
+  * [Writing queries](#writing-queries)
+    + [Select statements](#select-statements)
+      - [Where](#where)
+      - [Limit](#limit)
+    + [Updates and deletes](#updates-and-deletes)
+    + [Inserts](#inserts)
+  * [Migrations](#migrations)
+  * [TODO-List and current limitations](#todo-list-and-current-limitations)
+    + [Limitions (at the moment)](#limitions--at-the-moment-)
+    + [Planned for the future](#planned-for-the-future)
+    + [Interesting stuff that would be nice to have](#interesting-stuff-that-would-be-nice-to-have)
+
+## Getting started
+### Adding the dependency
+First, let's add sally to your project's `pubspec.yaml`:
+TODO: Finish this part of the readme when sally is out on pub.
+```yaml
+dependencies:
+  sally:
+    git:
+      url: 
+      path: sally/
+
+dev_dependencies:
+  sally_generator:
+    git:
+      url:
+      path: sally_generator/
+  build_runner:
+```
+We're going to use the `sally_flutter` library to specify tables and access the database. The
+`sally_generator` library will take care of generating the necessary code so the
+library knows how your table structure looks like.
+
+### Declaring tables
+You can use the DSL included with this library to specify your libraries with simple
+dart code:
+```dart
+import 'package:sally_flutter/sally_flutter.dart';
+
+// assuming that your file is called filename.dart. This will give an error at first,
+// but it's needed for sally to know about the generated code
+part 'filename.g.dart'; 
+
+// this will generate a table called "todos" for us. The rows of that table will
+// be represented by a class called "Todo".
+class Todos extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 6, max: 10)();
+  TextColumn get content => text().named('body')();
+  IntColumn get category => integer().nullable()();
+}
+
+// This will make sally generate a class called "Category" to represent a row in this table.
+// By default, "Categorie" would have been used because it only strips away the trailing "s"
+// in the table name.
+@DataClassName("Category")
+class Categories extends Table {
+  
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get description => text()();
+}
+
+// this annotation tells sally to prepare a database class that uses both of the
+// tables we just defined. We'll see how to use that database class in a moment.
+@UseSally(tables: [Todos, Categories])
+class MyDatabase {
+  
+}
+```
+
+__⚠️ Warning:__ Even though it might look like it, the content of a `Table` class does not support full Dart code. It can only
+be used to declare the table name, it's primary keys and columns. The code inside of a table class will never be 
+executed. Instead, the generator will take a look at your table classes to figure out how their structure looks like.
+This won't work if the body of your tables is not constant. This should not be problem, but please be aware of this as you can't put logic inside these classes.
+
+### Generating the code
+Sally integrates with the dart `build` system, so you can generate all the code needed with 
+`flutter packages pub run build_runner build`. If you want to continously rebuild the code
+whever you change your code, run `flutter packages pub run build_runner watch` instead.
+After running either command once, sally generator will have created a class for your
+database and data classes for your entities. To use it, change the `MyDatabase` class as
+follows:
+```dart
+@UseSally(tables: [Todos, Categories])
+class MyDatabase extends _$MyDatabase {
+  // we tell the database where to store the data with this constructor
+  MyDatabase() : super(FlutterQueryExecutor.inDatabaseFolder(path: 'db.sqlite'));
+
+  // you should bump this number whenever you change or add a table definition. Migrations
+  // are covered later in this readme.
+  @override
+  int get schemaVersion => 1; 
+}
+```
+You can ignore the `schemaVersion` at the moment, the important part is that you can
+now run your queries with fluent Dart code:
+## Writing queries
+```dart
+class MyDatabase extends _$MyDatabase {
+  // .. the versionCode getter still needs to be here
+
+  // loads all todo entries
+  Future<List<Todo>> get allTodoEntries => select(todos).get();
+
+  // watches all todo entries in a given category. The stream will automatically
+  // emit new items whenever the underlying data changes.
+  Stream<List<TodoEntry>> watchEntriesInCategory(Category c) {
+    return (select(todos)..where((t) => t.category.equals(c.id))).watch();
+  }
+}
+```
+### Select statements
+You can create `select` statements by starting them with `select(tableName)`, where the 
+table name
+is a field generated for you by sally. Each table used in a database will have a matching field
+to run queries against. A query can be run once with `get()` or be turned into an auto-updating
+stream using `watch()`.
+#### Where
+You can apply filters to a query by calling `where()`. The where method takes a function that
+should map the given table to an `Expression` of boolean. A common way to create such expression
+is by using `equals` on expressions. Integer columns can also be compared with `isBiggerThan`
+and `isSmallerThan`. You can compose expressions using `and(a, b), or(a, b)` and `not(a)`.
+#### Limit
+You can limit the amount of results returned by calling `limit` on queries. The method accepts
+the amount of rows to return and an optional offset.
+### Updates and deletes
+You can use the generated `row` class to update individual fields of any row:
+```dart
+Future moveImportantTasksIntoCategory(Category target) {
+  return (update(todos)
+      ..where((t) => t.title.like('%Important%'))
+    ).write(TodoEntry(
+      category: target.id
+    ),
+  );
+}
+
+Future feelingLazy() {
+  // delete 10 todo entries just cause
+  return (delete(todos)..limit(10)).go();
+}
+```
+__⚠️ Caution:__ If you don't explicitly add a `where` or `limit` clause on updates or deletes, 
+the statement will affect all rows in the table!
+
+### Inserts
+You can very easily insert any valid object into tables:
+```dart
+// returns the generated id
+Future<int> addTodoEntry(Todo entry) {
+  return into(todos).insert(entry);
+}
+```
+All row classes generated will have a constructor that can be used to create objects:
+```dart
+addTodoEntry(
+  Todo(
+    title: 'Important task',
+    content: 'Refactor persistence code',
+  ),
+);
+```
+If a column is nullable or has a default value (this includes auto-increments), the field
+can be omitted. All other fields must be set and non-null. The `insert` method will throw
+otherwise.
+
+## Migrations
+Sally provides a migration API that can be used to gradually apply schema changes after bumping
+the `schemaVersion` getter inside the `Database` class. To use it, override the `migration`
+getter. Here's an example: Let's say you wanted to add a due date to your todo entries:
+```dart
+class Todos extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 6, max: 10)();
+  TextColumn get content => text().named('body')();
+  IntColumn get category => integer().nullable()();
+  DateTimeColumn get dueDate => dateTime().nullable()(); // we just added this column
+}
+```
+We can now change the `database` class like this:
+```dart
+  @override
+  int get schemaVersion => 1; // bump because the tables have changed
+
+  @override
+  MigrationStrategy get migration => MigrationStrategy(
+    onCreate: (Migrator m) {
+      return m.createAllTables();
+    },
+    onUpgrade: (Migrator m, int from, int to) async {
+      if (from == 1) {
+        // we added the dueDate propery in the change from version 1
+        await m.addColumn(todos, todos.dueDate);
+      }
+    }
+  );
+
+  // rest of class can stay the same
+```
+You can also add individual tables or drop them.
+
+## TODO-List and current limitations
+### Limitions (at the moment)
+- No joins
+- No `group by` or window functions
+- Custom primary key support is very limited
+- No `ORDER BY`
+
+### Planned for the future
+These aren't sorted by priority. If you have more ideas or want some features happening soon,
+let us know by creating an issue!
+
+- Refactor comparison API
+  1. Instead of defining them in `IntColumn`, move `isBiggerThan` and `isSmallerThan` into
+     a new class (comparable expression?)
+  2. Support for non-strict comparisons (<=, >=)
+  3. Support `ORDER BY` clauses.
+- Specify primary keys
+- Simple `COUNT(*)` operations (group operations will be much more complicated)
+- Support default values and expressions
+- Allow using DAOs or some other mechanism instead of having to put everything in the main 
+database class.
+- Support more Datatypes: We should at least support `Uint8List` out of the box,
+supporting floating / fixed point numbers as well would be awesome
+- Nullable / non-nullable datatypes
+  - DSL API ✔️
+  - Support in generator ✔️
+  - Use in queries (`IS NOT NULL`) ✔️
+  - Setting fields to null during updates
+- Support Dart VM apps
+- References
+  - DSL API
+  - Support in generator
+  - Validation
+- Table joins
+- Bulk inserts
+- Transactions
+### Interesting stuff that would be nice to have
+Implementing this will very likely result in backwards-incompatible changes.
+
+- Find a way to hide implementation details from users while still making them
+  accessible for the generated code
+- `GROUP BY` grouping functions 
+- Support for different database engines
+  - Support webapps via `AlaSQL` or a different engine

sally/README.md

@@ -1,128 +1,6 @@
 # Sally
-[![Build Status](https://travis-ci.com/simolus3/sally.svg?token=u4VnFEE5xnWVvkE6QsqL&branch=master)](https://travis-ci.com/simolus3/sally)
 
-Sally is an easy to use and safe way to persist data for Flutter apps. It features
+This library defines the APIs for the sally persistence library. When using the library,
-a fluent Dart DSL to describe tables and will generate matching database code that
+you'll probably want to use the sally_flutter implementation directly.
-can be used to easily read and store your app's data.
 
-__Note:__ This library is in development and not yet available for general use on `pub`.
+Please see the homepage of [sally](https://github.com/simolus3/sally) for details.
-
-## Using this library
-#### Adding the dependency
-First, let's add sally to your prooject's `pubspec.yaml`:
-```yaml
-dependencies:
-  sally:
-    git:
-      url: 
-      path: sally/
-
-dev_dependencies:
-  sally_generator:
-    git:
-      url:
-      path: sally_generator/
-  build_runner:
-```
-We're going to use the `sally` library to specify tables and write data. The
-`sally_generator` library will take care of generating the necessary code so the
-library knows how your table structure looks like.
-
-#### Declaring tables
-You can use the DSL included with this library to specify your libraries with simple
-dart code:
-```dart
-import 'package:sally/sally.dart';
-
-// assuming that your file is called filename.dart. This will give an error at first,
-// but it's needed for sally to know about the generated code
-part 'filename.g.dart'; 
-
-class Todos extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get name => text().withLength(min: 6, max: 10)();
-  TextColumn get content => text().named('body')();
-  IntColumn get category => integer()();
-}
-
-class Categories extends Table {
-  @override
-  String get tableName => 'todo_categories';
-  
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get description => text()();
-}
-
-@UseSally(tables: [Todos, Categories])
-class MyDatabase {
-  
-}
-```
-
-__⚠️ Warning:__ Even though it might look like it, the content of a `Table` class does not support full Dart code. It can only
-be used to declare the table name, it's primary keys and columns. The code inside of a table class will never be 
-executed. Instead, the generator will take a look at your table classes to figure out how their structure looks like.
-This won't work if the body of your tables is not constant. This should not be problem, but please be aware of this.
-
-#### Generating the code
-Sally integrates with the dart `build` system, so you can generate all the code needed with 
-`flutter packages pub run build_runner build`. If you want to continously rebuild the code
-whever you change your code, run `flutter packages pub run build_runner watch` instead.
-After running either command once, sally generator will have created a class for your
-database and data classes for your entities. To use it, change the `MyDatabase` class as
-follows:
-```dart
-@UseSally(tables: [Todos, Categories])
-class MyDatabase extends _$MyDatabase {
-  @override
-  int get schemaVersion => 1;
-  @override
-  MigrationStrategy get migration => MigrationStrategy();
-}
-```
-You can ignore these two getters there at the moment, the important part is that you can
-now run your queries with fluent Dart code:
-```dart
-class MyDatabase extends _$MyDatabase {
-  // .. the getters that have been defined above still need to be here
-
-  Future<List<Todo>> get allTodoEntries => select(todos).get();
-
-  Future<void> deleteCategory(Category toDelete) async {
-    await (delete(todos)..where((entry) => entry.category.equalsVal(category.id))).go();
-    await (delete(categories)..where((cat) => cat.id.equalsVal(toDelete.id))).go();
-  }
-}
-```
-
-## TODO-List
-If you have suggestions for new features or any other questions, feel free to
-create an issue.
-
-##### Before this library can be released
-- Stabilize all end-user APIs and document them extensively
-- More unit tests
-##### Definitely planned for the future
-- Specify primary keys
-- Simple `COUNT(*)` operations (group operations will be much more complicated)
-- Support default values and expressions
-- Allow using DAOs instead of having to put everything in the main database
-class.
-- Support more Datatypes: We should at least support `DateTime` and `Uint8List`,
-supporting floating / fixed point numbers as well would be awesome
-- Nullable / non-nullable datatypes
-  - DSL API
-  - Support in generator
-  - Use in queries (`IS NOT NULL`)
-  - Setting fields to null during updates
-- Verify constraints (text length, nullability, etc.) before inserting or
-  deleting data.
-- Support Dart VM apps
-- References
-- Table joins
-##### Interesting stuff that would be nice to have
-- Find a way to hide implementation details from users while still making them
-  accessible for the generated code
-- `GROUP BY` grouping functions 
-- Support for different database engines
-  - Support webapps via `AlaSQL` or a different engine

sally/lib/src/dsl/columns.dart

@@ -3,47 +3,76 @@
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
-abstract class Column<T, S extends SqlType<T>> extends Expression<S> {
+abstract class Column<T, S extends SqlType<T>> extends Expression<T, S> {}
-  Expression<BoolType> equalsExp(Expression<S> compare);
-  Expression<BoolType> equals(T compare);
-}
 
 abstract class IntColumn extends Column<int, IntType> {
-  Expression<BoolType> isBiggerThan(int i);
+  /// Whether this column is strictly bigger than [i].
-  Expression<BoolType> isSmallerThan(int i);
+  Expression<bool, BoolType> isBiggerThan(int i);
+
+  /// Whether this column is strictly smaller than [i].
+  Expression<bool, BoolType> isSmallerThan(int i);
 }
 
+/// A column that stores boolean values. Booleans will be stored as an integer
+/// that can either be 0 (false) or 1 (true).
 abstract class BoolColumn extends Column<bool, BoolType> {}
 
+/// A column that stores text.
 abstract class TextColumn extends Column<String, StringType> {
-  Expression<BoolType> like(String regex);
+  /// Whether this column matches the given pattern. For details on what patters
+  /// are valid and how they are interpreted, check out
+  /// [this tutorial](http://www.sqlitetutorial.net/sqlite-like/).
+  Expression<bool, BoolType> like(String regex);
 }
 
 /// A column that stores a [DateTime]. Times will be stored as unix timestamp
 /// and will thus have a second accuracy.
 abstract class DateTimeColumn extends Column<DateTime, DateTimeType> {}
 
+/// A column builder is used to specify which columns should appear in a table.
+/// All of the methods defined in this class and its subclasses are not meant to
+/// be called at runtime. Instead, sally_generator will take a look at your
+/// source code (specifically, it will analyze which of the methods you use) to
+/// figure out the column structure of a table.
 class ColumnBuilder<Builder, ResultColumn> {
   /// By default, the field name will be used as the column name, e.g.
-  /// `IntColumn get id = integer()` will have "id" as its associated name. To change
+  /// `IntColumn get id = integer()` will have "id" as its associated name.
-  /// this, use `IntColumn get id = integer((c) => c.named('user_id'))`.
+  /// Columns made up of multiple words are expected to be in camelCase and will
+  /// be converted to snake_case (e.g. a getter called accountCreationDate will
+  /// result in an SQL column called account_creation_date).
+  /// To change this default behavior, use something like
+  /// `IntColumn get id = integer((c) => c.named('user_id'))`.
   Builder named(String name) => null;
+
+  /// Marks this column as being part of a primary key. This is not yet
+  /// supported by sally.
   Builder primaryKey() => null;
 
   /// Marks this column as nullable. Nullable columns should not appear in a
-  /// primary key.
+  /// primary key. Columns are non-null by default.
   Builder nullable() => null;
 
+  /// Turns this column builder into a column. This method won't actually be
+  /// called in your code. Instead, sally_generator will take a look at your
+  /// source code to figure out your table structure.
   ResultColumn call() => null;
 }
 
 class IntColumnBuilder extends ColumnBuilder<IntColumnBuilder, IntColumn> {
+  /// Enables auto-increment for this column, which will also make this column
+  /// the primary key of the table.
   IntColumnBuilder autoIncrement() => this;
 }
 
 class BoolColumnBuilder extends ColumnBuilder<BoolColumnBuilder, BoolColumn> {}
 
 class TextColumnBuilder extends ColumnBuilder<TextColumnBuilder, TextColumn> {
+  /// Puts a constraint on the minimum and maximum length of text that can be
+  /// stored in this column (will be validated whenever this column is updated
+  /// or a value is inserted). If [min] is not null and one tries to write a
+  /// string so that [String.length] is smaller than [min], the query will throw
+  /// an exception when executed and no data will be written. The same applies
+  /// for [max].
   TextColumnBuilder withLength({int min, int max}) => this;
 }
 

sally/lib/src/dsl/database.dart

@@ -1,5 +1,10 @@
+/// Use this class as an annotation to inform sally_generator that a database
+/// class should be generated using the specified [UseSally.tables].
 class UseSally {
+  /// The tables to include in the database
   final List<Type> tables;
 
+  /// Use this class as an annotation to inform sally_generator that a database
+  /// class should be generated using the specified [UseSally.tables].
   const UseSally({this.tables});
 }

sally/lib/src/dsl/table.dart

@@ -1,22 +1,58 @@
 import 'package:meta/meta.dart';
 import 'package:sally/sally.dart';
 
+/// Subclasses represent a table in a database generated by sally.
 abstract class Table {
   const Table();
 
+  /// The sql table name to be used. By default, sally will use the snake_case
+  /// representation of your class name as the sql table name. For instance, a
+  /// [Table] class named `LocalSettings` will be called `local_settings` by
+  /// default.
+  /// You can change that behavior by overriding this method to use a custom
+  /// name. Please note that you must directly return a string literal by using
+  /// a getter. For instance `@override String get tableName => 'my_table';` is
+  /// valid, whereas `@override final String tableName = 'my_table';` or
+  /// `@override String get tableName => createMyTableName();` is not.
   @visibleForOverriding
   String get tableName => null;
 
+  /// In the future, you can override this to specify a custom primary key. This
+  /// is not supported by sally at the moment.
   @visibleForOverriding
   // todo allow custom primary key
   PrimaryKey get primaryKey => null;
 
+  /// Use this as the body of a getter to declare a column that holds integers.
+  /// Example (inside the body of a table class):
+  /// ```
+  /// IntColumn get id => integer().autoIncrement()();
+  /// ```
   @protected
   IntColumnBuilder integer() => null;
+
+  /// Use this as the body of a getter to declare a column that holds strings.
+  /// Example (inside the body of a table class):
+  /// ```
+  /// TextColumn get name => text()();
+  /// ```
   @protected
   TextColumnBuilder text() => null;
+
+  /// Use this as the body of a getter to declare a column that holds bools.
+  /// Example (inside the body of a table class):
+  /// ```
+  /// BoolColumn get isAwesome => boolean()();
+  /// ```
   @protected
   BoolColumnBuilder boolean() => null;
+
+  /// Use this as the body of a getter to declare a column that holds date and
+  /// time.
+  /// Example (inside the body of a table class):
+  /// ```
+  /// DateTimeColumn get accountCreatedAt => dateTime()();
+  /// ```
   @protected
   DateTimeColumnBuilder dateTime() => null;
 }

sally/lib/src/runtime/components/where.dart

@@ -3,7 +3,7 @@ import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
 class Where extends Component {
-  final Expression<BoolType> predicate;
+  final Expression<bool, BoolType> predicate;
 
   Where(this.predicate);
 

sally/lib/src/runtime/executor/executor.dart

@@ -18,7 +18,7 @@ abstract class GeneratedDatabase {
 
   int get schemaVersion;
   MigrationStrategy get migration => MigrationStrategy();
-  
+
   List<TableInfo> get allTables;
 
   GeneratedDatabase(this.typeSystem, this.executor, {this.streamQueries}) {

sally/lib/src/runtime/expressions/bools.dart

@@ -2,17 +2,20 @@ import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
-Expression<BoolType> and(Expression<BoolType> a, Expression<BoolType> b) =>
+Expression<bool, BoolType> and(
+        Expression<bool, BoolType> a, Expression<bool, BoolType> b) =>
     AndExpression(a, b);
 
-Expression<BoolType> or(Expression<BoolType> a, Expression<BoolType> b) =>
+Expression<bool, BoolType> or(
+        Expression<bool, BoolType> a, Expression<bool, BoolType> b) =>
     OrExpression(a, b);
 
-Expression<BoolType> not(Expression<BoolType> a) => NotExpression(a);
+Expression<bool, BoolType> not(Expression<bool, BoolType> a) =>
+    NotExpression(a);
 
-class AndExpression extends Expression<BoolType> with InfixOperator<BoolType> {
+class AndExpression extends InfixOperator<bool, BoolType> {
   @override
-  Expression<BoolType> left, right;
+  Expression<bool, BoolType> left, right;
 
   @override
   final String operator = 'AND';
@@ -20,9 +23,9 @@ class AndExpression extends Expression<BoolType> with InfixOperator<BoolType> {
   AndExpression(this.left, this.right);
 }
 
-class OrExpression extends Expression<BoolType> with InfixOperator<BoolType> {
+class OrExpression extends InfixOperator<bool, BoolType> {
   @override
-  Expression<BoolType> left, right;
+  Expression<bool, BoolType> left, right;
 
   @override
   final String operator = 'OR';
@@ -30,8 +33,8 @@ class OrExpression extends Expression<BoolType> with InfixOperator<BoolType> {
   OrExpression(this.left, this.right);
 }
 
-class NotExpression extends Expression<BoolType> {
+class NotExpression extends Expression<bool, BoolType> {
-  Expression<BoolType> inner;
+  Expression<bool, BoolType> inner;
 
   NotExpression(this.inner);
 

sally/lib/src/runtime/expressions/datetimes.dart

@@ -2,24 +2,24 @@ import 'package:sally/sally.dart';
 import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 
-Expression<IntType> year(Expression<DateTimeType> date) =>
+Expression<int, IntType> year(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%Y', date);
-Expression<IntType> month(Expression<DateTimeType> date) =>
+Expression<int, IntType> month(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%m', date);
-Expression<IntType> day(Expression<DateTimeType> date) =>
+Expression<int, IntType> day(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%d', date);
-Expression<IntType> hour(Expression<DateTimeType> date) =>
+Expression<int, IntType> hour(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%H', date);
-Expression<IntType> minute(Expression<DateTimeType> date) =>
+Expression<int, IntType> minute(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%M', date);
-Expression<IntType> second(Expression<DateTimeType> date) =>
+Expression<int, IntType> second(Expression<DateTime, DateTimeType> date) =>
     _StrftimeSingleFieldExpression('%S', date);
 
 /// Expression that extracts components out of a date time by using the builtin
 /// sqlite function "strftime" and casting the result to an integer.
-class _StrftimeSingleFieldExpression extends Expression<IntType> {
+class _StrftimeSingleFieldExpression extends Expression<int, IntType> {
   final String format;
-  final Expression<DateTimeType> date;
+  final Expression<DateTime, DateTimeType> date;
 
   _StrftimeSingleFieldExpression(this.format, this.date);
 

sally/lib/src/runtime/expressions/expression.dart

@@ -1,15 +1,27 @@
 import 'package:meta/meta.dart';
+import 'package:sally/sally.dart';
 import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
 /// Any sql expression that evaluates to some generic value. This does not
 /// include queries (which might evaluate to multiple values) but individual
 /// columns, functions and operators.
-abstract class Expression<T extends SqlType> implements Component {}
+abstract class Expression<D, T extends SqlType<D>> implements Component {
+  /// Whether this expression is equal to the given expression.
+  Expression<bool, BoolType> equalsExp(Expression<D, T> compare) =>
+      Comparison.equal(this, compare);
+
+  /// Whether this column is equal to the given value, which must have a fitting
+  /// type. The [compare] value will be written
+  /// as a variable using prepared statements, so there is no risk of
+  /// an SQL-injection.
+  Expression<bool, BoolType> equals(D compare) =>
+      Comparison.equal(this, Variable<D, T>(compare));
+}
 
 /// An expression that looks like "$a operator $b$, where $a and $b itself
 /// are expressions and the operator is any string.
-abstract class InfixOperator<T extends SqlType> implements Expression<T> {
+abstract class InfixOperator<D, T extends SqlType<D>> with Expression<D, T> {
   Expression get left;
   Expression get right;
   String get operator;
@@ -41,7 +53,7 @@ abstract class InfixOperator<T extends SqlType> implements Expression<T> {
 
 enum ComparisonOperator { less, lessOrEqual, equal, moreOrEqual, more }
 
-class Comparison extends InfixOperator<BoolType> {
+class Comparison extends InfixOperator<bool, BoolType> {
   static const Map<ComparisonOperator, String> operatorNames = {
     ComparisonOperator.less: '<',
     ComparisonOperator.lessOrEqual: '<=',

sally/lib/src/runtime/expressions/in.dart

@@ -3,18 +3,19 @@ import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
-Expression<BoolType> isIn<X extends SqlType<T>, T>(
+Expression<bool, BoolType> isIn<X extends SqlType<T>, T>(
-    Expression<X> expression, Iterable<T> values, {bool not = false}) {
+    Expression<T, X> expression, Iterable<T> values,
+    {bool not = false}) {
   return _InExpression(expression, values, not);
 }
 
-Expression<BoolType> isNotIn<X extends SqlType<T>, T>(
+Expression<bool, BoolType> isNotIn<X extends SqlType<T>, T>(
-        Expression<X> expression, Iterable<T> values) =>
+        Expression<T, X> expression, Iterable<T> values) =>
     isIn(expression, values, not: true);
 
-class _InExpression<X extends SqlType<T>, T> extends Expression<BoolType> {
+class _InExpression<X extends SqlType<T>, T>
-
+    extends Expression<bool, BoolType> {
-  final Expression<X> _expression;
+  final Expression<T, X> _expression;
   final Iterable<T> _values;
   final bool _not;
 
@@ -46,5 +47,4 @@ class _InExpression<X extends SqlType<T>, T> extends Expression<BoolType> {
 
     context.buffer.write(')');
   }
-
+}
-}

sally/lib/src/runtime/expressions/null_check.dart

@@ -2,11 +2,11 @@ import 'package:sally/sally.dart';
 import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 
-Expression<BoolType> isNull(Expression inner) => _NullCheck(inner, true);
+Expression<bool, BoolType> isNull(Expression inner) => _NullCheck(inner, true);
-Expression<BoolType> isNotNull(Expression inner) => _NullCheck(inner, false);
+Expression<bool, BoolType> isNotNull(Expression inner) =>
-
+    _NullCheck(inner, false);
-class _NullCheck extends Expression<BoolType> {
 
+class _NullCheck extends Expression<bool, BoolType> {
   final Expression _inner;
   final bool _isNull;
 
@@ -22,5 +22,4 @@ class _NullCheck extends Expression<BoolType> {
     }
     context.buffer.write('NULL');
   }
-
+}
-}

sally/lib/src/runtime/expressions/text.dart

@@ -2,9 +2,9 @@ import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
-class LikeOperator extends Expression<BoolType> {
+class LikeOperator extends Expression<bool, BoolType> {
-  final Expression<StringType> target;
+  final Expression<String, StringType> target;
-  final Expression<StringType> regex;
+  final Expression<String, StringType> regex;
 
   LikeOperator(this.target, this.regex);
 

sally/lib/src/runtime/expressions/user_api.dart

@@ -2,4 +2,4 @@ export 'bools.dart' show and, or, not;
 export 'datetimes.dart';
 export 'in.dart';
 export 'null_check.dart';
-export 'variables.dart';
+export 'variables.dart';

sally/lib/src/runtime/expressions/variables.dart

@@ -2,7 +2,7 @@ import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
-class Variable<T, S extends SqlType<T>> extends Expression<S> {
+class Variable<T, S extends SqlType<T>> extends Expression<T, S> {
   final T value;
 
   Variable(this.value);
@@ -14,7 +14,7 @@ class Variable<T, S extends SqlType<T>> extends Expression<S> {
   }
 }
 
-class Constant<T, S extends SqlType<T>> extends Expression<S> {
+class Constant<T, S extends SqlType<T>> extends Expression<T, S> {
   final T value;
 
   Constant(this.value);

sally/lib/src/runtime/statements/delete.dart

@@ -18,7 +18,7 @@ class DeleteStatement<UserTable> extends Query<UserTable, dynamic> {
 
     final rows = ctx.database.executor.doWhenOpened((e) async {
       final rows =
-      await ctx.database.executor.runDelete(ctx.sql, ctx.boundVariables);
+          await ctx.database.executor.runDelete(ctx.sql, ctx.boundVariables);
 
       if (rows > 0) {
         database.markTableUpdated(table.$tableName);

sally/lib/src/runtime/statements/query.dart

@@ -24,7 +24,7 @@ abstract class Query<Table, DataClass> {
 
   void writeStartPart(GenerationContext ctx);
 
-  void where(Expression<BoolType> filter(Table tbl)) {
+  void where(Expression<bool, BoolType> filter(Table tbl)) {
     final predicate = filter(table.asDslTable);
 
     if (whereExpr == null) {

sally/lib/src/runtime/structure/columns.dart

@@ -26,18 +26,11 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
   @visibleForOverriding
   String get typeName;
 
-  @override
-  Expression<BoolType> equalsExp(Expression<S> compare) =>
-      Comparison.equal(this, compare);
-
   @override
   void writeInto(GenerationContext context) {
     context.buffer.write($name);
   }
 
-  @override
-  Expression<BoolType> equals(T compare) => equalsExp(Variable<T, S>(compare));
-
   /// Checks whether the given value fits into this column. The default
   /// implementation checks whether the value is not null, as null values are
   /// only allowed for updates or if the column is nullable.
@@ -60,7 +53,7 @@ class GeneratedTextColumn extends GeneratedColumn<String, StringType>
       : super(name, nullable);
 
   @override
-  Expression<BoolType> like(String regex) =>
+  Expression<bool, BoolType> like(String regex) =>
       LikeOperator(this, Variable<String, StringType>(regex));
 
   @override
@@ -110,7 +103,6 @@ class GeneratedIntColumn extends GeneratedColumn<int, IntType>
       {this.hasAutoIncrement = false})
       : super(name, nullable);
 
-
   @override
   void writeColumnDefinition(StringBuffer into) {
     if (hasAutoIncrement) {
@@ -121,11 +113,11 @@ class GeneratedIntColumn extends GeneratedColumn<int, IntType>
   }
 
   @override
-  Expression<BoolType> isBiggerThan(int i) =>
+  Expression<bool, BoolType> isBiggerThan(int i) =>
       Comparison(this, ComparisonOperator.more, Variable<int, IntType>(i));
 
   @override
-  Expression<BoolType> isSmallerThan(int i) =>
+  Expression<bool, BoolType> isSmallerThan(int i) =>
       Comparison(this, ComparisonOperator.less, Variable<int, IntType>(i));
 
   @override

sally/pubspec.yaml

@@ -1,8 +1,11 @@
 name: sally
-description: A starting point for Dart libraries or applications.
+description: Sally is a safe and reactive persistence library for Dart applications
-# version: 1.0.0
+version: 1.0.0
-# homepage: https://www.example.com
+homepage: https://github.com/simolus3/sally
-# author: Simon Binder <email@example.com>
+authors:
+  - Flutter Community <community@flutter.zone>
+  - Simon Binder <simolus3@gmail.com>
+maintainer: Simon Binder (@simolus3)
 
 environment:
   sdk: '>=2.0.0 <3.0.0'

sally/test/expressions/datetime_expression_test.dart

@@ -3,7 +3,8 @@ import 'package:sally/src/runtime/components/component.dart';
 import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:test_api/test_api.dart';
 
-typedef Expression<IntType> _Extractor(Expression<DateTimeType> d);
+typedef Expression<int, IntType> _Extractor(
+    Expression<DateTime, DateTimeType> d);
 
 /// Tests the top level [year], [month], ..., [second] methods
 void main() {

sally/test/expressions/in_expression_test.dart

@@ -15,4 +15,4 @@ void main() {
     expect(context.sql, 'name IN (?, ?)');
     expect(context.boundVariables, ['Max', 'Tobias']);
   });
-}
+}

sally/test/expressions/is_null_test.dart

@@ -24,4 +24,4 @@ void main() {
 
     expect(context.sql, 'name IS NOT NULL');
   });
-}
+}

sally_flutter/README.md

@@ -1,14 +1,259 @@
-# sally_flutter
+# Sally
+[![Build Status](https://travis-ci.com/simolus3/sally.svg?token=u4VnFEE5xnWVvkE6QsqL&branch=master)](https://travis-ci.com/simolus3/sally)
 
-Flutter implementation for the sally database
+Sally is an easy to use and safe way to persist data for Flutter apps. It features
+a fluent Dart DSL to describe tables and will generate matching database code that
+can be used to easily read and store your app's data. It also features a reactive
+API that will deliver auto-updating streams for your queries.
 
-## Getting Started
+- [Sally](#sally)
+  * [Getting started](#getting-started)
+    + [Adding the dependency](#adding-the-dependency)
+    + [Declaring tables](#declaring-tables)
+    + [Generating the code](#generating-the-code)
+  * [Writing queries](#writing-queries)
+    + [Select statements](#select-statements)
+      - [Where](#where)
+      - [Limit](#limit)
+    + [Updates and deletes](#updates-and-deletes)
+    + [Inserts](#inserts)
+  * [Migrations](#migrations)
+  * [TODO-List and current limitations](#todo-list-and-current-limitations)
+    + [Limitions (at the moment)](#limitions--at-the-moment-)
+    + [Planned for the future](#planned-for-the-future)
+    + [Interesting stuff that would be nice to have](#interesting-stuff-that-would-be-nice-to-have)
 
-This project is a starting point for a Dart
+## Getting started
-[package](https://flutter.io/developing-packages/),
+### Adding the dependency
-a library module containing code that can be shared easily across
+First, let's add sally to your project's `pubspec.yaml`:
-multiple Flutter or Dart projects.
+TODO: Finish this part of the readme when sally is out on pub.
+```yaml
+dependencies:
+  sally:
+    git:
+      url: 
+      path: sally/
 
-For help getting started with Flutter, view our 
+dev_dependencies:
-[online documentation](https://flutter.io/docs), which offers tutorials, 
+  sally_generator:
-samples, guidance on mobile development, and a full API reference.
+    git:
+      url:
+      path: sally_generator/
+  build_runner:
+```
+We're going to use the `sally_flutter` library to specify tables and access the database. The
+`sally_generator` library will take care of generating the necessary code so the
+library knows how your table structure looks like.
+
+### Declaring tables
+You can use the DSL included with this library to specify your libraries with simple
+dart code:
+```dart
+import 'package:sally_flutter/sally_flutter.dart';
+
+// assuming that your file is called filename.dart. This will give an error at first,
+// but it's needed for sally to know about the generated code
+part 'filename.g.dart'; 
+
+// this will generate a table called "todos" for us. The rows of that table will
+// be represented by a class called "Todo".
+class Todos extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 6, max: 10)();
+  TextColumn get content => text().named('body')();
+  IntColumn get category => integer().nullable()();
+}
+
+// This will make sally generate a class called "Category" to represent a row in this table.
+// By default, "Categorie" would have been used because it only strips away the trailing "s"
+// in the table name.
+@DataClassName("Category")
+class Categories extends Table {
+  
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get description => text()();
+}
+
+// this annotation tells sally to prepare a database class that uses both of the
+// tables we just defined. We'll see how to use that database class in a moment.
+@UseSally(tables: [Todos, Categories])
+class MyDatabase {
+  
+}
+```
+
+__⚠️ Warning:__ Even though it might look like it, the content of a `Table` class does not support full Dart code. It can only
+be used to declare the table name, it's primary keys and columns. The code inside of a table class will never be 
+executed. Instead, the generator will take a look at your table classes to figure out how their structure looks like.
+This won't work if the body of your tables is not constant. This should not be problem, but please be aware of this as you can't put logic inside these classes.
+
+### Generating the code
+Sally integrates with the dart `build` system, so you can generate all the code needed with 
+`flutter packages pub run build_runner build`. If you want to continously rebuild the code
+whever you change your code, run `flutter packages pub run build_runner watch` instead.
+After running either command once, sally generator will have created a class for your
+database and data classes for your entities. To use it, change the `MyDatabase` class as
+follows:
+```dart
+@UseSally(tables: [Todos, Categories])
+class MyDatabase extends _$MyDatabase {
+  // we tell the database where to store the data with this constructor
+  MyDatabase() : super(FlutterQueryExecutor.inDatabaseFolder(path: 'db.sqlite'));
+
+  // you should bump this number whenever you change or add a table definition. Migrations
+  // are covered later in this readme.
+  @override
+  int get schemaVersion => 1; 
+}
+```
+You can ignore the `schemaVersion` at the moment, the important part is that you can
+now run your queries with fluent Dart code:
+## Writing queries
+```dart
+class MyDatabase extends _$MyDatabase {
+  // .. the versionCode getter still needs to be here
+
+  // loads all todo entries
+  Future<List<Todo>> get allTodoEntries => select(todos).get();
+
+  // watches all todo entries in a given category. The stream will automatically
+  // emit new items whenever the underlying data changes.
+  Stream<List<TodoEntry>> watchEntriesInCategory(Category c) {
+    return (select(todos)..where((t) => t.category.equals(c.id))).watch();
+  }
+}
+```
+### Select statements
+You can create `select` statements by starting them with `select(tableName)`, where the 
+table name
+is a field generated for you by sally. Each table used in a database will have a matching field
+to run queries against. A query can be run once with `get()` or be turned into an auto-updating
+stream using `watch()`.
+#### Where
+You can apply filters to a query by calling `where()`. The where method takes a function that
+should map the given table to an `Expression` of boolean. A common way to create such expression
+is by using `equals` on expressions. Integer columns can also be compared with `isBiggerThan`
+and `isSmallerThan`. You can compose expressions using `and(a, b), or(a, b)` and `not(a)`.
+#### Limit
+You can limit the amount of results returned by calling `limit` on queries. The method accepts
+the amount of rows to return and an optional offset.
+### Updates and deletes
+You can use the generated `row` class to update individual fields of any row:
+```dart
+Future moveImportantTasksIntoCategory(Category target) {
+  return (update(todos)
+      ..where((t) => t.title.like('%Important%'))
+    ).write(TodoEntry(
+      category: target.id
+    ),
+  );
+}
+
+Future feelingLazy() {
+  // delete 10 todo entries just cause
+  return (delete(todos)..limit(10)).go();
+}
+```
+__⚠️ Caution:__ If you don't explicitly add a `where` or `limit` clause on updates or deletes, 
+the statement will affect all rows in the table!
+
+### Inserts
+You can very easily insert any valid object into tables:
+```dart
+// returns the generated id
+Future<int> addTodoEntry(Todo entry) {
+  return into(todos).insert(entry);
+}
+```
+All row classes generated will have a constructor that can be used to create objects:
+```dart
+addTodoEntry(
+  Todo(
+    title: 'Important task',
+    content: 'Refactor persistence code',
+  ),
+);
+```
+If a column is nullable or has a default value (this includes auto-increments), the field
+can be omitted. All other fields must be set and non-null. The `insert` method will throw
+otherwise.
+
+## Migrations
+Sally provides a migration API that can be used to gradually apply schema changes after bumping
+the `schemaVersion` getter inside the `Database` class. To use it, override the `migration`
+getter. Here's an example: Let's say you wanted to add a due date to your todo entries:
+```dart
+class Todos extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 6, max: 10)();
+  TextColumn get content => text().named('body')();
+  IntColumn get category => integer().nullable()();
+  DateTimeColumn get dueDate => dateTime().nullable()(); // we just added this column
+}
+```
+We can now change the `database` class like this:
+```dart
+  @override
+  int get schemaVersion => 1; // bump because the tables have changed
+
+  @override
+  MigrationStrategy get migration => MigrationStrategy(
+    onCreate: (Migrator m) {
+      return m.createAllTables();
+    },
+    onUpgrade: (Migrator m, int from, int to) async {
+      if (from == 1) {
+        // we added the dueDate propery in the change from version 1
+        await m.addColumn(todos, todos.dueDate);
+      }
+    }
+  );
+
+  // rest of class can stay the same
+```
+You can also add individual tables or drop them.
+
+## TODO-List and current limitations
+### Limitions (at the moment)
+- No joins
+- No `group by` or window functions
+- Custom primary key support is very limited
+- No `ORDER BY`
+
+### Planned for the future
+These aren't sorted by priority. If you have more ideas or want some features happening soon,
+let us know by creating an issue!
+
+- Refactor comparison API
+  1. Instead of defining them in `IntColumn`, move `isBiggerThan` and `isSmallerThan` into
+     a new class (comparable expression?)
+  2. Support for non-strict comparisons (<=, >=)
+  3. Support `ORDER BY` clauses.
+- Specify primary keys
+- Simple `COUNT(*)` operations (group operations will be much more complicated)
+- Support default values and expressions
+- Allow using DAOs or some other mechanism instead of having to put everything in the main 
+database class.
+- Support more Datatypes: We should at least support `Uint8List` out of the box,
+supporting floating / fixed point numbers as well would be awesome
+- Nullable / non-nullable datatypes
+  - DSL API ✔️
+  - Support in generator ✔️
+  - Use in queries (`IS NOT NULL`) ✔️
+  - Setting fields to null during updates
+- Support Dart VM apps
+- References
+  - DSL API
+  - Support in generator
+  - Validation
+- Table joins
+- Bulk inserts
+- Transactions
+### Interesting stuff that would be nice to have
+Implementing this will very likely result in backwards-incompatible changes.
+
+- Find a way to hide implementation details from users while still making them
+  accessible for the generated code
+- `GROUP BY` grouping functions 
+- Support for different database engines
+  - Support webapps via `AlaSQL` or a different engine

sally_flutter/example/lib/bloc.dart

@@ -6,6 +6,12 @@ class TodoBloc {
 
   Stream<List<TodoEntry>> get todosForHomepage => _db.todosWithoutCategories;
 
+  void createTodoEntry(String text) {
+    _db.addTodoEntry(TodoEntry(
+      content: text,
+    ));
+  }
+
   void dispose() {
 
   }

sally_flutter/example/lib/database.dart

@@ -31,6 +31,18 @@ class Database extends _$Database {
   @override
   int get schemaVersion => 1;
 
+  @override
+  MigrationStrategy get migration => MigrationStrategy(
+    onCreate: (Migrator m) {
+      return m.createAllTables();
+    },
+    onUpgrade: (Migrator m, int from, int to) async {
+      if (from == 1) {
+        await m.addColumn(todos, todos.targetDate);
+      }
+    }
+  );
+
   Stream<List<Category>> get definedCategories => select(categories).watch();
 
   Stream<List<TodoEntry>> todosInCategories(List<Category> categories) {
@@ -39,6 +51,22 @@ class Database extends _$Database {
     return (select(todos)..where((t) => isIn(t.category, ids))).watch();
   }
 
+  Future<void> deleteOldEntries() {
+    return (delete(todos)..where((t) => year(t.targetDate).equals(2017))).go();
+  }
+
+  Stream<List<TodoEntry>> watchEntriesInCategory(Category c) {
+    return (select(todos)..where((t) => t.category.equals(c.id))).watch();
+  }
+
   Stream<List<TodoEntry>> get todosWithoutCategories =>
       (select(todos)..where((t) => isNull(t.category))).watch();
+
+  Future test() {
+    (delete(todos)..limit(10)).go();
+  }
+
+  Future addTodoEntry(TodoEntry entry) {
+    return into(todos).insert(entry);
+  }
 }

sally_flutter/example/lib/widgets/homescreen.dart

@@ -11,37 +11,32 @@ class HomeScreen extends StatelessWidget {
 
     return Scaffold(
       drawer: Text('Hi'),
-      body: Column(
+      body: CustomScrollView(
-        children: [
+        slivers: [
-          Expanded(
+          SliverAppBar(
-            flex: 9,
+            title: Text('TODO List'),
-            child: CustomScrollView(
-              slivers: [
-                SliverAppBar(
-                  title: Text('TODO List'),
-                ),
-                StreamBuilder<List<TodoEntry>>(
-                  stream: bloc.todosForHomepage,
-                  builder: (ctx, snapshot) {
-                    final data = snapshot.hasData ? snapshot.data : <TodoEntry>[];
-                    
-                    return SliverList(
-                      delegate: SliverChildBuilderDelegate(
-                        (ctx, index) => Text(data[index].content),
-                        childCount: data.length,
-                      ),
-                    );
-                  },
-                ),
-              ],
-            ),
           ),
-          Expanded(
+          StreamBuilder<List<TodoEntry>>(
-            flex: 9,
+            stream: bloc.todosForHomepage,
-            child: Container(),
+            builder: (ctx, snapshot) {
+              final data = snapshot.hasData ? snapshot.data : <TodoEntry>[];
+
+              return SliverList(
+                delegate: SliverChildBuilderDelegate(
+                  (ctx, index) => Text(data[index].content),
+                  childCount: data.length,
+                ),
+              );
+            },
           ),
         ],
       ),
+      bottomSheet: Material(
+        elevation: 12.0,
+        child: TextField(
+          onSubmitted: bloc.createTodoEntry,
+        ),
+      ),
     );
   }
 }

sally_flutter/pubspec.lock

@@ -73,7 +73,7 @@ packages:
       path: "../sally"
       relative: true
     source: path
-    version: "0.0.0"
+    version: "1.0.0"
   sky_engine:
     dependency: transitive
     description: flutter

sally_flutter/pubspec.yaml

@@ -1,8 +1,10 @@
 name: sally_flutter
-description: Flutter implementation for the sally database
+description: Flutter implementation of sally, a safe and reactive persistence library for Dart applications
-version: 0.0.1
+version: 1.0.0
-author:
+authors:
-homepage:
+  - Flutter Community <community@flutter.zone>
+  - Simon Binder <simolus3@gmail.com>
+maintainer: Simon Binder (@simolus3)
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"

sally_generator/README.md

@@ -1,22 +1,7 @@
-A library for Dart developers.
+# Sally Generator
 
-Created from templates made available by Stagehand under a BSD-style
+This library contains the generator that turns your `Table` classes from sally
-[license](https://github.com/dart-lang/stagehand/blob/master/LICENSE).
+into database code. When using the sally, you'll probably want to use the 
+sally_flutter implementation directly.
 
-## Usage
+Please see the homepage of [sally](https://github.com/simolus3/sally) for details.
-
-A simple usage example:
-
-```dart
-import 'package:sally_generator/sally_generator.dart';
-
-main() {
-  var awesome = new Awesome();
-}
-```
-
-## Features and bugs
-
-Please file feature requests and bugs at the [issue tracker][tracker].
-
-[tracker]: http://example.com/issues/replaceme

sally_generator/pubspec.yaml

@@ -1,8 +1,11 @@
 name: sally_generator
-description: A starting point for Dart libraries or applications.
+description: Sally generator generated database code from your table classes
-# version: 1.0.0
+version: 1.0.0
-# homepage: https://www.example.com
+homepage: https://github.com/simolus3/sally
-# author: Simon Binder <email@example.com>
+authors:
+  - Flutter Community <community@flutter.zone>
+  - Simon Binder <simolus3@gmail.com>
+maintainer: Simon Binder (@simolus3)
 
 environment:
   sdk: '>=2.0.0 <3.0.0'

tool/license.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 
-rm -f  example/LICENSE
 rm -f sally/LICENSE
 rm -f sally_flutter/LICENSE
 rm -f sally_generator/LICENSE
 
-cp LICENSE example/LICENSE
 cp LICENSE sally/LICENSE
 cp LICENSE sally_flutter/LICENSE
 cp LICENSE sally_generator/LICENSE

tool/readme_copier.sh

@@ -0,0 +1,2 @@
+rm README.md
+cp sally_flutter/README.md README.md