From 973ee40fdf92870d11bad42b7bbf46a6f66e9dc5 Mon Sep 17 00:00:00 2001
From: wemeya <wemeya@163.com>
Date: Thu, 19 May 2016 14:40:09 +0800
Subject: [PATCH] fix a sql bug

---
 dao/dao_test.go | 13 +++++++++++++
 dao/project.go  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dao/dao_test.go b/dao/dao_test.go
index 7f9f07978..8e300740d 100644
--- a/dao/dao_test.go
+++ b/dao/dao_test.go
@@ -624,6 +624,19 @@ func TestGetAllProjects(t *testing.T) {
 	}
 }
 
+func TestGetPublicProjects(t *testing.T) {
+	projects, err := GetPublicProjects("")
+	if err != nil {
+		t.Errorf("Error occurred in getProjects: %v", err)
+	}
+	if len(projects) != 1 {
+		t.Errorf("Expected length of projects is 1, but actual: %d, the projects: %+v", len(projects), projects)
+	}
+	if projects[0].Name != "library" {
+		t.Errorf("Expected project name in the list: %s, actual: %s", "library", projects[0].Name)
+	}
+}
+
 func TestAddProjectMember(t *testing.T) {
 	err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER)
 	if err != nil {
diff --git a/dao/project.go b/dao/project.go
index 8ff03fb28..730b1f331 100644
--- a/dao/project.go
+++ b/dao/project.go
@@ -221,7 +221,6 @@ func GetPublicProjects(projectName string) ([]models.Project, error) {
 	publicProjects, err := getProjects(1, projectName)
 	if err != nil {
 		return nil, err
-
 	}
 	return publicProjects, nil
 }
@@ -242,7 +241,7 @@ func getProjects(public int, projectName string) ([]models.Project, error) {
 		where deleted = 0`
 	queryParam := make([]interface{}, 1)
 	if public == 1 {
-		sql += "and public = ?"
+		sql += " and public = ? "
 		queryParam = append(queryParam, public)
 	}
 	if len(projectName) > 0 {
@@ -251,6 +250,7 @@ func getProjects(public int, projectName string) ([]models.Project, error) {
 	}
 	sql += " order by name "
 	var projects []models.Project
+	log.Debugf("sql xxx", sql)
 	if _, err := o.Raw(sql, queryParam).QueryRows(&projects); err != nil {
 		return nil, err
 	}