From 289ae7531cce575d23504f5ca1d1c8e5143cc186 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Fri, 29 Oct 2021 09:33:34 +0100
Subject: [PATCH] use tableName func for Count

---
 db/handler/db.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/db/handler/db.go b/db/handler/db.go
index 43b6e98..b85d310 100644
--- a/db/handler/db.go
+++ b/db/handler/db.go
@@ -321,17 +321,13 @@ func (e *Db) Truncate(ctx context.Context, req *db.TruncateRequest, rsp *db.Trun
 }
 
 func (e *Db) Count(ctx context.Context, req *db.CountRequest, rsp *db.CountResponse) error {
-	tenantId, ok := tenant.FromContext(ctx)
-	if !ok {
-		tenantId = "micro"
-	}
 	if req.Table == "" {
 		req.Table = "default"
 	}
-	tenantId = strings.Replace(strings.Replace(tenantId, "/", "_", -1), "-", "_", -1)
-	tableName := tenantId + "_" + req.Table
-	if !re.Match([]byte(tableName)) {
-		return errors.BadRequest("db.count", fmt.Sprintf("table name %v is invalid", req.Table))
+
+	tableName, err := e.tableName(ctx, req.Table)
+	if err != nil {
+		return err
 	}
 
 	db, err := e.GetDBConn(ctx)