@@ -37,7 +37,7 @@ typedef enum
3737 SPOCK_RESOLVE_KEEP_LOCAL ,
3838 SPOCK_RESOLVE_LAST_UPDATE_WINS ,
3939 SPOCK_RESOLVE_FIRST_UPDATE_WINS
40- } SpockResolveOption ;
40+ } SpockResolveOption ;
4141
4242extern int spock_conflict_resolver ;
4343extern int spock_conflict_log_level ;
@@ -53,35 +53,35 @@ extern bool spock_save_resolutions;
5353 */
5454typedef enum
5555{
56- /* The row to be inserted violates unique constraint */
57- CT_INSERT_EXISTS ,
56+ /* The row to be inserted violates unique constraint */
57+ CT_INSERT_EXISTS ,
5858
59- /* The row to be updated was modified by a different origin */
60- CT_UPDATE_ORIGIN_DIFFERS ,
59+ /* The row to be updated was modified by a different origin */
60+ CT_UPDATE_ORIGIN_DIFFERS ,
6161
62- /* The updated row value violates unique constraint */
63- CT_UPDATE_EXISTS ,
62+ /* The updated row value violates unique constraint */
63+ CT_UPDATE_EXISTS ,
6464
65- /* The row to be updated is missing */
66- CT_UPDATE_MISSING ,
65+ /* The row to be updated is missing */
66+ CT_UPDATE_MISSING ,
6767
68- /* The row to be deleted was modified by a different origin */
69- CT_DELETE_ORIGIN_DIFFERS ,
68+ /* The row to be deleted was modified by a different origin */
69+ CT_DELETE_ORIGIN_DIFFERS ,
7070
71- /* The row to be deleted is missing */
72- CT_DELETE_MISSING
71+ /* The row to be deleted is missing */
72+ CT_DELETE_MISSING
7373
74- /*
75- * Other conflicts, such as exclusion constraint violations, involve more
76- * complex rules than simple equality checks. These conflicts are left for
77- * future improvements.
78- */
74+ /*
75+ * Other conflicts, such as exclusion constraint violations, involve more
76+ * complex rules than simple equality checks. These conflicts are left for
77+ * future improvements.
78+ */
7979} ConflictType ;
8080#endif
8181
82- extern int spock_conflict_resolver ;
83- extern int spock_conflict_log_level ;
84- extern bool spock_save_resolutions ;
82+ extern int spock_conflict_resolver ;
83+ extern int spock_conflict_log_level ;
84+ extern bool spock_save_resolutions ;
8585
8686extern bool get_tuple_origin (SpockRelation * rel , HeapTuple local_tuple ,
8787 ItemPointer tid , TransactionId * xmin ,
@@ -125,4 +125,4 @@ extern bool spock_conflict_resolver_check_hook(int *newval, void **extra,
125125extern void tuple_to_stringinfo (StringInfo s , TupleDesc tupdesc ,
126126 HeapTuple tuple );
127127
128- #endif /* SPOCK_CONFLICT_H */
128+ #endif /* SPOCK_CONFLICT_H */
0 commit comments