JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/metabase: fix CommitObject query for postgres

Browse Source 
Query was not working for postgres because types were not correctly set.

Change-Id: Ic898aa37b71a4754e4ebe82085f3563fc954616a
This commit is contained in:
Michal Niewrzal 2023-08-08 16:24:20 +02:00 committed by Michał Niewrzał
parent 55b23d2bdb
commit 887209bc24
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
satellite/metabase/commit.go
View File

@ -753,8 +753,9 @@ func (db *DB) CommitObject(ctx context.Context, opts CommitObject) (object Objec
object_key = $3 AND object_key = $3 AND
stream_id = $5 stream_id = $5
RETURNING RETURNING
project_id, bucket_name, object_key, $4::INT as version, stream_id, project_id, bucket_name, object_key, $4::INT4 as version, stream_id,
`+committedStatus+` as status, $6::INT as segment_count, $7::INT as total_plain_size, $8::INT as total_encrypted_size, $9::INT as fixed_segment_size, NULL as zombie_deletion_deadline, `+committedStatus+` as status, $6::INT4 as segment_count, $7::INT8 as total_plain_size, $8::INT8 as total_encrypted_size, $9::INT4 as fixed_segment_size,
NULL::timestamp as zombie_deletion_deadline,
CASE CASE
WHEN encryption = 0 AND $10 <> 0 THEN $10 WHEN encryption = 0 AND $10 <> 0 THEN $10
WHEN encryption = 0 AND $10 = 0 THEN NULL WHEN encryption = 0 AND $10 = 0 THEN NULL
@ -765,8 +766,8 @@ func (db *DB) CommitObject(ctx context.Context, opts CommitObject) (object Objec
), object_to_commit AS ( ), object_to_commit AS (
SELECT SELECT
project_id, bucket_name, object_key, version, stream_id, project_id, bucket_name, object_key, version, stream_id,
status, segment_count, total_plain_size, total_encrypted_size, fixed_segment_size, zombie_deletion_deadline, status, segment_count, total_plain_size, total_encrypted_size, fixed_segment_size,
encryption, zombie_deletion_deadline, encryption,
CASE CASE
WHEN $14::BOOL = true THEN $11 WHEN $14::BOOL = true THEN $11
ELSE delete_pending_object.encrypted_metadata_nonce ELSE delete_pending_object.encrypted_metadata_nonce