diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-11-09 15:03:57 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2017-11-18 12:58:48 -0500 |
| commit | 657cb1b7f6be1610d6888acf18bb77027108ea9e (patch) | |
| tree | a5bce6add325ee02cfbf574c3decb3d663b45d5f | |
| parent | 57300be94d3de0a9710458a3070c064b0d5231d3 (diff) | |
| download | podman-657cb1b7f6be1610d6888acf18bb77027108ea9e.tar.gz podman-657cb1b7f6be1610d6888acf18bb77027108ea9e.tar.bz2 podman-657cb1b7f6be1610d6888acf18bb77027108ea9e.zip | |
Fix lingering SQL error
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| -rw-r--r-- | libpod/sql_state.go | 16 | ||||
| -rw-r--r-- | libpod/sql_state_internal.go | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libpod/sql_state.go b/libpod/sql_state.go index 4754bf71e..424eb81fb 100644 --- a/libpod/sql_state.go +++ b/libpod/sql_state.go @@ -104,10 +104,10 @@ func (s *SQLState) Container(id string) (*Container, error) { containerState.StartedTime, containerState.FinishedTime, containerState.ExitCode - FROM containers - INNER JOIN - containerState ON containers.Id = containerState.Id - WHERE containers.Id=?;` + FROM containers + INNER JOIN + containerState ON containers.Id = containerState.Id + WHERE containers.Id=?;` if !s.valid { return nil, ErrDBClosed @@ -133,10 +133,10 @@ func (s *SQLState) LookupContainer(idOrName string) (*Container, error) { containerState.StartedTime, containerState.FinishedTime, containerState.ExitCode - FROM containers - INNER JOIN - containerState ON containers.Id = containerState.Id - WHERE (containers.Id LIKE ?) OR containers.Name=?;` + FROM containers + INNER JOIN + containerState ON containers.Id = containerState.Id + WHERE (containers.Id LIKE ?) OR containers.Name=?;` if !s.valid { return nil, ErrDBClosed diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go index 3f5f695bb..da7c708e7 100644 --- a/libpod/sql_state_internal.go +++ b/libpod/sql_state_internal.go @@ -32,7 +32,7 @@ func prepareDB(db *sql.DB) (err error) { // Create a table for unchanging container data const createCtr = ` - CREATE TABLE IF NOT EXIST containers( + CREATE TABLE IF NOT EXISTS containers( Id TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL UNIQUE, MountLabel TEXT NOT NULL, @@ -40,7 +40,7 @@ func prepareDB(db *sql.DB) (err error) { Stdin INTEGER NOT NULL, LabelsJSON TEXT NOT NULL, StopSignal INTEGER NOT NULL, - CreatedTime TEXT NOT NULL + CreatedTime TEXT NOT NULL, RootfsImageID TEXT NOT NULL, RootfsImageName TEXT NOT NULL, UseImageConfig INTEGER NOT NULL, @@ -52,7 +52,7 @@ func prepareDB(db *sql.DB) (err error) { // Create a table for changing container state const createCtrState = ` - CREATE TABLE IF NOT EXIST containerState( + CREATE TABLE IF NOT EXISTS containerState( Id TEXT NOT NULL PRIMARY KEY, State INTEGER NOT NULL, ConfigPath TEXT NOT NULL, |