Skip to content

fix(datastore): delete default predicate causes deletion failure #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjnoyp merged 2 commits into from
Feb 28, 2022
Merged

fix(datastore): delete default predicate causes deletion failure #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80d18ae
fix(datastore): delete default predicate causes deletion failure
HuiSF Feb 25, 2022
acc6c33
fix save integration test
fjnoyp Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/amplify_datastore/example/integration_test/save_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* permissions and limitations under the License.
*/

import 'package:amplify_datastore/amplify_datastore.dart';
import 'package:amplify_datastore_example/models/ModelProvider.dart';
import 'package:integration_test/integration_test.dart';
import 'package:flutter_test/flutter_test.dart';
Expand Down Expand Up @@ -71,12 +72,14 @@ void main() {
await Amplify.DataStore.save(testBlog);

var updatedBlog = testBlog.copyWith(name: 'changed name');
await Amplify.DataStore.save(updatedBlog,
where: Blog.NAME.contains("Predicate"));

var blogs = await Amplify.DataStore.query(Blog.classType);
expect(blogs.length, 1);
expect(blogs[0].name, originalBlogName);
expect(
() => Amplify.DataStore.save(updatedBlog,
where: Blog.NAME.contains("Predicate")),
throwsA(predicate((e) =>
e is DataStoreException &&
e.message.contains(
"condition did not match existing model instance"))));
});

testWidgets('predicate should not prevent save for matching model',
Expand All @@ -89,7 +92,7 @@ void main() {
const matchingBlogName = 'matching blog name';
var updatedBlog = testBlog.copyWith(name: matchingBlogName);
await Amplify.DataStore.save(updatedBlog,
where: Blog.NAME.contains("matching"));
where: Blog.NAME.contains("original"));

var blogs = await Amplify.DataStore.query(Blog.classType);
expect(blogs.length, 1);
Expand Down
3 changes: 2 additions & 1 deletion packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin {
modelSchemaRegistry: modelSchemaRegistry,
modelName: modelName
)
let queryPredicates = try QueryPredicateBuilder.fromSerializedMap(args["queryPredicate"] as? [String : Any])
let queryPredicatesMap = args["queryPredicate"] as? [String : Any];
let queryPredicates = queryPredicatesMap != nil ? try QueryPredicateBuilder.fromSerializedMap(queryPredicatesMap) : nil;

let serializedModelData = try FlutterDataStoreRequestUtils.getSerializedModelData(methodChannelArguments: args)
let modelID = try FlutterDataStoreRequestUtils.getModelID(serializedModelData: serializedModelData)
Expand Down