From e8af7fcf6da03da65a379c12c90e6626c31846ae Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 18 Feb 2014 11:41:11 +0100 Subject: [PATCH] runtime: Fix unique constraint error checks The sqlite3 version in fedora (3.8) returns a different error string in the unique constraints failure case than the one in hack/ (3.7). This updates the check to detect both, fixing one integration check failure on Fedora. Docker-DCO-1.1-Signed-off-by: Alexander Larsson (github: alexlarsson) --- pkg/graphdb/graphdb.go | 16 ++++++++++++++++ runtime.go | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/graphdb/graphdb.go b/pkg/graphdb/graphdb.go index 9e2466b692..46a23b1e7b 100644 --- a/pkg/graphdb/graphdb.go +++ b/pkg/graphdb/graphdb.go @@ -4,6 +4,7 @@ import ( "database/sql" "fmt" "path" + "strings" "sync" ) @@ -51,6 +52,21 @@ type Database struct { mux sync.RWMutex } +func IsNonUniqueNameError(err error) bool { + str := err.Error() + // sqlite 3.7.17-1ubuntu1 returns: + // Set failure: Abort due to constraint violation: columns parent_id, name are not unique + if strings.HasSuffix(str, "name are not unique") { + return true + } + // sqlite-3.8.3-1.fc20 returns: + // Set failure: Abort due to constraint violation: UNIQUE constraint failed: edge.parent_id, edge.name + if strings.Contains(str, "UNIQUE constraint failed") && strings.Contains(str, "edge.name") { + return true + } + return false +} + // Create a new graph database initialized with a root entity func NewDatabase(conn *sql.DB, init bool) (*Database, error) { if conn == nil { diff --git a/runtime.go b/runtime.go index 0c2c17d7a4..6cebab6e1c 100644 --- a/runtime.go +++ b/runtime.go @@ -396,7 +396,7 @@ func (runtime *Runtime) Create(config *runconfig.Config, name string) (*Containe // Set the enitity in the graph using the default name specified if _, err := runtime.containerGraph.Set(name, id); err != nil { - if !strings.HasSuffix(err.Error(), "name are not unique") { + if !graphdb.IsNonUniqueNameError(err) { return nil, nil, err }