Fix table names on joins when db has a namespace

This regression was introduced through parts of these commits:
- 8ee1f4d
- 1df6447

Author: mraerino

api/download.go

@@ -110,7 +110,7 @@ func (a *API) DownloadList(w http.ResponseWriter, r *http.Request) error {
 	orderTable := a.db.NewScope(models.Order{}).QuotedTableName()
 	downloadsTable := a.db.NewScope(models.Download{}).QuotedTableName()
 
-	query := a.db.Joins("join " + orderTable + " as orders ON " + downloadsTable + ".order_id = " + orderTable + ".id and " + orderTable + ".payment_state = 'paid'")
+	query := a.db.Joins("join " + orderTable + " ON " + downloadsTable + ".order_id = " + orderTable + ".id and " + orderTable + ".payment_state = 'paid'")
 	if order != nil {
 		query = query.Where(orderTable+".id = ?", order.ID)
 	} else {

api/reports.go

@@ -63,7 +63,7 @@ func (a *API) ProductsReport(w http.ResponseWriter, r *http.Request) error {
 	query := a.db.
 		Model(&models.LineItem{}).
 		Select("sku, path, sum(quantity * price) as total, currency").
-		Joins("JOIN " + ordersTable + " as orders " + "ON orders.id = " + itemsTable + ".order_id " + "AND orders.payment_state = 'paid'").
+		Joins("JOIN " + ordersTable + " ON " + ordersTable + ".id = " + itemsTable + ".order_id " + "AND " + ordersTable + ".payment_state = 'paid'").
 		Group("sku, path, currency").
 		Order("total desc")
 

api/test.env

@@ -4,6 +4,7 @@ GOCOMMERCE_JWT_AUD=api.netlify.com
 GOCOMMERCE_DB_DRIVER=sqlite3
 GOCOMMERCE_DB_AUTOMIGRATE=true
 GOCOMMERCE_DB_DATABASE_URL=test.db
+GOCOMMERCE_DB_NAMESPACE=test
 GOCOMMERCE_API_HOST=localhost
 PORT=9999
 GOCOMMERCE_LOG_LEVEL=error

api/user.go

@@ -91,7 +91,7 @@ func (a *API) UserList(w http.ResponseWriter, r *http.Request) error {
 	orderTable := a.db.NewScope(models.Order{}).QuotedTableName()
 	userTable := a.db.NewScope(models.User{}).QuotedTableName()
 	query = query.
-		Joins("LEFT JOIN " + orderTable + " as orders ON " + userTable + ".id = " + orderTable + ".user_id").
+		Joins("LEFT JOIN " + orderTable + " ON " + userTable + ".id = " + orderTable + ".user_id").
 		Group(userTable + ".id")
 
 	instanceID := gcontext.GetInstanceID(r.Context())

api/utils_test.go

@@ -69,6 +69,7 @@ func testConfig() (*conf.GlobalConfiguration, *conf.Configuration) {
 
 	globalConfig := new(conf.GlobalConfiguration)
 	globalConfig.DB.Automigrate = true
+	globalConfig.DB.Namespace = "test"
 
 	config := new(conf.Configuration)
 	config.JWT.Secret = "testsecret"