Skip to content

Commit a828f82

Browse files
cbaker6cbaker6
authored
refactor: add external parameter name to merge (#322)
* refactor: add external parameter name to merge * fix tests * Fix playgrounds * fix auth tests
1 parent b1993c9 commit a828f82

File tree

47 files changed

+150
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+150
-151
lines changed

‎ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ struct GameScore: ParseObject {
4242
var points: Int?
4343

4444
//: Implement your own version of merge
45-
func merge(_ object: Self) throws -> Self {
46-
var updated = try mergeParse(object)
45+
func merge(with object: Self) throws -> Self {
46+
var updated = try mergeParse(with: object)
4747
if updated.shouldRestoreKey(\.points,
4848
original: object) {
4949
updated.points = object.points
@@ -80,8 +80,8 @@ struct GameData: ParseObject {
8080
var bytes: ParseBytes?
8181

8282
//: Implement your own version of merge
83-
func merge(_ object: Self) throws -> Self {
84-
var updated = try mergeParse(object)
83+
func merge(with object: Self) throws -> Self {
84+
var updated = try mergeParse(with: object)
8585
if shouldRestoreKey(\.polygon,
8686
original: object) {
8787
updated.polygon = object.polygon

‎ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ struct GameScore: ParseObject {
112112
var points: Int?
113113

114114
//: Implement your own version of merge
115-
func merge(_ object: Self) throws -> Self {
116-
var updated = try mergeParse(object)
115+
func merge(with object: Self) throws -> Self {
116+
var updated = try mergeParse(with: object)
117117
if updated.shouldRestoreKey(\.points,
118118
original: object) {
119119
updated.points = object.points

‎ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ struct GameScore: ParseObject {
2424
var name: String?
2525

2626
//: Implement your own version of merge
27-
func merge(_ object: Self) throws -> Self {
28-
var updated = try mergeParse(object)
27+
func merge(with object: Self) throws -> Self {
28+
var updated = try mergeParse(with: object)
2929
if updated.shouldRestoreKey(\.points,
3030
original: object) {
3131
updated.points = object.points

‎ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ struct User: ParseUser {
3232
var customKey: String?
3333

3434
//: Implement your own version of merge
35-
func merge(_ object: Self) throws -> Self {
36-
var updated = try mergeParse(object)
35+
func merge(with object: Self) throws -> Self {
36+
var updated = try mergeParse(with: object)
3737
if updated.shouldRestoreKey(\.customKey,
3838
original: object) {
3939
updated.customKey = object.customKey
@@ -55,8 +55,8 @@ struct Role<RoleUser: ParseUser>: ParseRole {
5555
var name: String?
5656

5757
//: Implement your own version of merge
58-
func merge(_ object: Self) throws -> Self {
59-
var updated = try mergeParse(object)
58+
func merge(with object: Self) throws -> Self {
59+
var updated = try mergeParse(with: object)
6060
if updated.shouldRestoreKey(\.name,
6161
original: object) {
6262
updated.name = object.name
@@ -78,8 +78,8 @@ struct GameScore: ParseObject {
7878
var points: Int?
7979

8080
//: Implement your own version of merge
81-
func merge(_ object: Self) throws -> Self {
82-
var updated = try mergeParse(object)
81+
func merge(with object: Self) throws -> Self {
82+
var updated = try mergeParse(with: object)
8383
if updated.shouldRestoreKey(\.points,
8484
original: object) {
8585
updated.points = object.points

‎ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ struct GameScore: ParseObject {
2626
var name: String?
2727

2828
//: Implement your own version of merge
29-
func merge(_ object: Self) throws -> Self {
30-
var updated = try mergeParse(object)
29+
func merge(with object: Self) throws -> Self {
30+
var updated = try mergeParse(with: object)
3131
if updated.shouldRestoreKey(\.points,
3232
original: object) {
3333
updated.points = object.points

‎ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ struct GameScore: ParseObject {
3333
var points: Int?
3434

3535
//: Implement your own version of merge
36-
func merge(_ object: Self) throws -> Self {
37-
var updated = try mergeParse(object)
36+
func merge(with object: Self) throws -> Self {
37+
var updated = try mergeParse(with: object)
3838
if updated.shouldRestoreKey(\.points,
3939
original: object) {
4040
updated.points = object.points

‎ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ struct GameScore: ParseObject {
3434
var myFiles: [ParseFile]?
3535

3636
//: Implement your own version of merge
37-
func merge(_ object: Self) throws -> Self {
38-
var updated = try mergeParse(object)
37+
func merge(with object: Self) throws -> Self {
38+
var updated = try mergeParse(with: object)
3939
if updated.shouldRestoreKey(\.points,
4040
original: object) {
4141
updated.points = object.points

‎ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ struct GameScore: ParseObject {
3434
var name: String?
3535

3636
//: Implement your own version of merge
37-
func merge(_ object: Self) throws -> Self {
38-
var updated = try mergeParse(object)
37+
func merge(with object: Self) throws -> Self {
38+
var updated = try mergeParse(with: object)
3939
if updated.shouldRestoreKey(\.points,
4040
original: object) {
4141
updated.points = object.points

‎ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ struct GameScore: ParseObject {
3232
var name: String?
3333

3434
//: Implement your own version of merge
35-
func merge(_ object: Self) throws -> Self {
36-
var updated = try mergeParse(object)
35+
func merge(with object: Self) throws -> Self {
36+
var updated = try mergeParse(with: object)
3737
if updated.shouldRestoreKey(\.points,
3838
original: object) {
3939
updated.points = object.points

‎ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ struct GameScore: ParseObject {
2727
var isHighest: Bool?
2828

2929
//: Implement your own version of merge
30-
func merge(_ object: Self) throws -> Self {
31-
var updated = try mergeParse(object)
30+
func merge(with object: Self) throws -> Self {
31+
var updated = try mergeParse(with: object)
3232
if updated.shouldRestoreKey(\.points,
3333
original: object) {
3434
updated.points = object.points

0 commit comments

Comments
 (0)