Move a db query to db_images.go.

Signed-off-by: René Jochum <rene@jochums.at>
lxc · Aug 11, 2015 · a6112e9 · a6112e9
1 parent 4e9b7e9
commit a6112e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/lxd/db_images.go b/lxd/db_images.go
@@ -10,6 +10,18 @@ import (
 	"github.com/lxc/lxd/shared"
 )
 
+func dbImageIDGet(db *sql.DB, fp string) int {
+	q := `SELECT id FROM images WHERE fingerprint=?`
+	id := -1
+	arg1 := []interface{}{fp}
+	arg2 := []interface{}{&id}
+	err := dbQueryRowScan(db, q, arg1, arg2)
+	if err != nil {
+		return -1
+	}
+	return id
+}
+
 func doImagesGet(d *Daemon, recursion bool, public bool) (interface{}, error) {
 	resultString := []string{}
 	resultMap := []shared.ImageInfo{}

diff --git a/lxd/remote.go b/lxd/remote.go
@@ -27,23 +27,11 @@ func remoteGetImageFingerprint(d *Daemon, server string, alias string) (string,
 	return result.Name, nil
 }
 
-func (d *Daemon) dbGetimage(fp string) int {
-	q := `SELECT id FROM images WHERE fingerprint=?`
-	id := -1
-	arg1 := []interface{}{fp}
-	arg2 := []interface{}{&id}
-	err := dbQueryRowScan(d.db, q, arg1, arg2)
-	if err != nil {
-		return -1
-	}
-	return id
-}
-
 func ensureLocalImage(d *Daemon, server, fp string, secret string, forContainer bool) error {
 	var url string
 	var exporturl string
 
-	if d.dbGetimage(fp) != -1 {
+	if dbImageIDGet(d.db, fp) != -1 {
 		// already have it
 		return nil
 	}