fix rebase conflicts and ignore orig files

.gitignore

@@ -16,6 +16,7 @@ tmp/*
 .idea/
 .DS_STORE
 .envrc.local
+*.orig
 
 .vscode/*
 !.vscode/settings.example.json

internal/db/copy.go

@@ -87,7 +87,7 @@ func CloneToProject(ctx context.Context, tx pgx.Tx, source int64, target int64,
 	sql = fmt.Sprintf(`
 	%v
 	INSERT INTO dl.objects (project, start_version, stop_version, path, hash, mode, size, packed)
-	SELECT $%d, $%d, null, path, hash, mode, size, packed
+	SELECT $%d, $%d, null, path, (h1, h2)::hash, mode, size, packed
 	FROM changed_objects
 	WHERE deleted IS false
 	ON CONFLICT

internal/db/query.go

@@ -192,9 +192,9 @@ func GetObjects(ctx context.Context, tx pgx.Tx, packManager *PackManager, projec
 		var encoded []byte
 		var packed bool
 		var deleted bool
-		var hash *string
+		var h1, h2 []byte
 
-		err := rows.Scan(&path, &mode, &size, &encoded, &packed, &deleted, &hash)
+		err := rows.Scan(&path, &mode, &size, &encoded, &packed, &deleted, &h1, &h2)
 		if err != nil {
 			return nil, fmt.Errorf("getObjects scan, project %v vrange %v: %w", project, vrange, err)
 		}
@@ -253,9 +253,9 @@ func GetTars(ctx context.Context, tx pgx.Tx, project int64, vrange VersionRange,
 		var encoded []byte
 		var packed bool
 		var deleted bool
-		var hash *string
+		var h1, h2 []byte
 
-		err := rows.Scan(&path, &mode, &size, &encoded, &packed, &deleted, &hash)
+		err := rows.Scan(&path, &mode, &size, &encoded, &packed, &deleted, &h1, &h2)
 		if err != nil {
 			return nil, nil, fmt.Errorf("getTars scan, project %v vrange %v: %w", project, vrange, err)
 		}

internal/db/queryBuilder.go

@@ -131,7 +131,7 @@ func (qb *queryBuilder) queryWithoutRemovals() string {
 	%s
 	)
 
-	SELECT path, mode, size, bytes, packed, deleted, hash
+	SELECT path, mode, size, bytes, packed, deleted, (hash).h1, (hash).h2
 	FROM updated_objects
 	`
 
@@ -148,10 +148,10 @@ func (qb *queryBuilder) queryWithRemovals() string {
 	%s
 	)
 
-	SELECT path, mode, size, bytes, packed, deleted, hash
+	SELECT path, mode, size, bytes, packed, deleted, (hash).h1, (hash).h2
 	FROM updated_objects
 	UNION ALL
-	SELECT path, mode, size, bytes, packed, deleted, hash
+	SELECT path, mode, size, bytes, packed, deleted, (hash).h1, (hash).h2
 	FROM removed_objects
 	`