Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions pgqueue/manager/partition.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ func (manager *Manager) DropDrainedPartition(ctx context.Context) (result string
if oldest.Count > 0 {
return "", nil
}

// Don't drop a partition if the sequence hasn't advanced past its end — new
// inserts could still land in this range.
seq, err := manager.GetPartitionSeq(ctx)
if err != nil {
return "", err
}
if seq < oldest.End {
return "", nil
}
if err := manager.DeletePartition(ctx, oldest.Partition); err != nil {
return "", err
} else {
Expand Down
5 changes: 5 additions & 0 deletions queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ func NewQueries(r io.Reader) (*Queries, error) {
self.keys = append(self.keys, key)
}

// Remove any ; at the end of each SQL statement
for k, v := range self.queries {
self.queries[k] = strings.TrimSuffix(v, ";")
}

// Check for scanner errors
if err := scanner.Err(); err != nil {
return nil, err
Expand Down
Loading