Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
simolus3 committed Dec 11, 2021
2 parents bf0dcfb + 877a349 commit c4e2600
Showing 13 changed files with 23 additions and 13 deletions.
2 changes: 2 additions & 0 deletions docs/build.deploy.yaml
Original file line number Diff line number Diff line change
@@ -27,6 +27,8 @@ targets:
dart2js_args:
- "-O4"
- "--csp"
moor_generator:
enabled: false
sources:
- "lib/**"
- "pages/**"
2 changes: 1 addition & 1 deletion drift/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
- Drift isolates no longer serialize messages into a primitive format. This will reduce
the overhead of using isolates with Drift.

## 1.0.0
## 1.0.1

- Add `DoUpdate.withExcluded` to refer to the excluded row in an upsert clause.
- Add optional `where` clause to `DoUpdate` constructors
2 changes: 1 addition & 1 deletion drift/lib/src/dsl/database.dart
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ class DriftDatabase {
/// {@endtemplate}
final Map<String, String> queries;

/// {@template drift_compile_queries_param}
/// {@template drift_include_param}
///
/// Defines the `.drift` files to include when building the table structure
/// for this database. For details on how to integrate `.drift` files into
3 changes: 2 additions & 1 deletion drift/lib/src/dsl/table.dart
Original file line number Diff line number Diff line change
@@ -170,13 +170,14 @@ abstract class View extends HasResultSet {
/// A class to be used as an annotation on [Table] classes to customize the
/// name for the data class that will be generated for the table class. The data
/// class is a dart object that will be used to represent a row in the table.
///
/// {@template drift_custom_data_class}
/// By default, drift will attempt to use the singular form of the table name
/// when naming data classes (e.g. a table named "Users" will generate a data
/// class called "User"). However, this doesn't work for irregular plurals and
/// you might want to choose a different name, for which this annotation can be
/// used.
/// {@template}
/// {@endtemplate}
@Target({TargetKind.classType})
class DataClassName {
/// The overridden name to use when generating the data class for a table.
2 changes: 1 addition & 1 deletion drift/lib/src/runtime/api/dao_base.dart
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ part of 'runtime_api.dart';
/// This comes in handy to structure large amounts of database code better: The
/// migration logic can live in the main [GeneratedDatabase] class, but code
/// can be extracted into [DatabaseAccessor]s outside of that database.
/// For details on how to write a dao, see [UseDao].
/// For details on how to write a dao, see [DriftAccessor].
/// [T] should be the associated database class you wrote.
abstract class DatabaseAccessor<T extends GeneratedDatabase>
extends DatabaseConnectionUser {
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ part of '../query_builder.dart';
/// Returns the amount of rows in the current group matching the optional
/// [filter].
///
/// {@templace drift_aggregate_filter}
/// {@template drift_aggregate_filter}
/// To only consider rows matching a predicate, you can set the optional
/// [filter]. Note that [filter] is only available from sqlite 3.30, released on
/// 2019-10-04. Most devices will use an older sqlite version.
2 changes: 1 addition & 1 deletion drift/lib/src/runtime/query_builder/migration.dart
Original file line number Diff line number Diff line change
@@ -478,7 +478,7 @@ extension DestructiveMigrationExtension on GeneratedDatabase {
}

/// Contains instructions needed to run a complex migration on a table, using
/// the steps described in [Making other kinds of table schema changes][https://www.sqlite.org/lang_altertable.html#otheralter].
/// the steps described in [Making other kinds of table schema changes](https://www.sqlite.org/lang_altertable.html#otheralter).
///
/// For examples and more details, see [the documentation](https://drift.simonbinder.eu/docs/advanced-features/migrations/#complex-migrations).
@experimental
3 changes: 1 addition & 2 deletions drift/lib/src/runtime/query_builder/statements/query.dart
Original file line number Diff line number Diff line change
@@ -58,8 +58,7 @@ abstract class Query<T extends HasResultSet, D> extends Component {
/// Constructs the query that can then be sent to the database executor.
///
/// This is used internally by drift to run the query. Users should use the
/// other methods explained in the [documentation][drift-docs].
/// [drift-docs]: https://drift.simonbinder.eu/docs/getting-started/writing_queries/
/// other methods explained in the [documentation](https://drift.simonbinder.eu/docs/getting-started/writing_queries/).
GenerationContext constructQuery() {
final ctx = GenerationContext.fromDb(database);
writeInto(ctx);
2 changes: 2 additions & 0 deletions moor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@

- Fix the moor analyzer plugin not starting

Version 4.6.1+1 adds information about the name change to the README.

## 4.6.0

- Add `DoUpdate.withExcluded` to refer to the excluded row in an upsert clause.
4 changes: 2 additions & 2 deletions moor/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: moor
description: Moor has been renamed to Drift.
version: 4.6.1
version: 4.6.1+2
repository: https://github.com/simolus3/moor
homepage: https://moor.simonbinder.eu/
issue_tracker: https://github.com/simolus3/moor/issues
@@ -12,7 +12,7 @@ dependencies:
async: ^2.5.0
convert: ^3.0.0
collection: ^1.15.0
drift: ^1.0.0
drift: ^1.1.0
meta: ^1.3.0
stream_channel: ^2.1.0
sqlite3: ^1.0.0
2 changes: 2 additions & 0 deletions moor_generator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ At the next breaking release, moor will be discontinued in favor of the `drift`
Please consider migrating to `drift` at a suitable opportunity.
Automated migration tooling exists! See https://drift.simonbinder.eu/name for details.

Version 4.6.0+1 adds information about the name change to the README.

## 4.5.1

- Fix generating parameters when `named_parameters_always_required` is enabled.
2 changes: 1 addition & 1 deletion moor_generator/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: moor_generator
description: Moor has been renamed to Drift.
version: 4.6.0
version: 4.6.1
repository: https://github.com/simolus3/moor
homepage: https://moor.simonbinder.eu/
issue_tracker: https://github.com/simolus3/moor/issues
8 changes: 6 additions & 2 deletions sqlparser/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## 0.19.0

- Support generated columns
- Support features introduced in sqlite version 3.37, most notably `STRICT` tables
- Support generated columns.
- Support features introduced in sqlite version 3.37, most notably `STRICT` tables.

## 0.18.1

- Fix the AST comparator missing errors for different amount of children.

## 0.18.0

0 comments on commit c4e2600

Please sign in to comment.