Skip to content

Commit

Permalink
Merge pull request #205 from SUSE/helm-fixes
Browse files Browse the repository at this point in the history
Fixes for SQL layer for mysql
  • Loading branch information
richard-cox authored Sep 9, 2019
2 parents 5620409 + 454f20b commit b1a2ab8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/jetstream/plugins/monocular/sql_datastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var updateChart = `UPDATE charts

var insertChartFile = `INSERT INTO chart_files (id, filename, chart_id, name, repo_name, digest, content) VALUES ($1, $2, $3, $4, $5, $6, $7)`
var updateChartFile = `UPDATE chart_files SET chart_id = $1, name = $2, repo_name = $3, digest = $4, content = $5 WHERE id = $6 AND filename = $7`
var countChartFile = `SELECT COUNT(*) FROM chart_Files WHERE id = $1 AND filename = $2`
var countChartFile = `SELECT COUNT(*) FROM chart_files WHERE id = $1 AND filename = $2`

var deleteChartFiles = `DELETE FROM chart_files WHERE (name, repo_name) IN (SELECT name, repo_name FROM charts WHERE repo_name = $1 AND update_batch != $2)`
var deleteCharts = `DELETE FROM charts WHERE repo_name = $1 AND update_batch != $2`
Expand Down Expand Up @@ -151,7 +151,7 @@ func (s *SQLDBCMonocularDatastore) ImportCharts(charts []chartrepo.Chart) error
return fmt.Errorf("Unable to delete chart files: %v", err)
}

if _, err := s.db.Exec(deleteChart, repoName, updateBatchID); err != nil {
if _, err := s.db.Exec(deleteChart, repoName); err != nil {
return fmt.Errorf("Unable to delete charts: %v", err)
}

Expand Down

0 comments on commit b1a2ab8

Please sign in to comment.