From bc9f8b5003f08d37a78e16bcead0ac056ec75ea3 Mon Sep 17 00:00:00 2001
From: Jun Nishimura <n.junjun0303@gmail.com>
Date: Sat, 30 Mar 2024 10:26:50 +0900
Subject: [PATCH] override table name (#5)

---
 adapter.go | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/adapter.go b/adapter.go
index cd62179..3f2513e 100644
--- a/adapter.go
+++ b/adapter.go
@@ -116,7 +116,7 @@ func connectDB(driverName, dataSourceName string) (*bun.DB, error) {
 func (a *bunAdapter) createTalbe() error {
 	if _, err := a.db.NewCreateTable().
 		Model((*CasbinPolicy)(nil)).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		IfNotExists().
 		Exec(context.Background()); err != nil {
 		return err
@@ -141,7 +141,7 @@ func (a *bunAdapter) LoadPolicy(model model.Model) error {
 	var policies []CasbinPolicy
 	err := a.db.NewSelect().
 		Model(&policies).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Scan(context.Background())
 	if err != nil {
 		return err
@@ -200,7 +200,7 @@ func (a *bunAdapter) savePolicyRecords(policies []CasbinPolicy) error {
 	// bulk insert new policies
 	if _, err := a.db.NewInsert().
 		Model(&policies).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Exec(context.Background()); err != nil {
 		return err
 	}
@@ -208,15 +208,18 @@ func (a *bunAdapter) savePolicyRecords(policies []CasbinPolicy) error {
 	return nil
 }
 
-// delete all policy rules from the storage.
+// drop and recreate the table
 func (a *bunAdapter) refreshTable() error {
-	if _, err := a.db.NewTruncateTable().
-		Model((*CasbinPolicy)(nil)).
-		Table(a.tableName).
+	// just truncate the table could be a better choice
+	// but NewTruncateTable() does not support ModelTableExpr
+	// so we drop and recreate the table instead
+	if _, err := a.db.NewDropTable().
+		ModelTableExpr(a.tableName).
+		IfExists().
 		Exec(context.Background()); err != nil {
 		return err
 	}
-	return nil
+	return a.createTalbe()
 }
 
 // AddPolicy adds a policy rule to the storage.
@@ -225,7 +228,7 @@ func (a *bunAdapter) AddPolicy(sec string, ptype string, rule []string) error {
 	newPolicy := newCasbinPolicy(ptype, rule)
 	if _, err := a.db.NewInsert().
 		Model(&newPolicy).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Exec(context.Background()); err != nil {
 		return err
 	}
@@ -241,7 +244,7 @@ func (a *bunAdapter) AddPolicies(sec string, ptype string, rules [][]string) err
 	}
 	if _, err := a.db.NewInsert().
 		Model(&policies).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Exec(context.Background()); err != nil {
 		return err
 	}
@@ -274,7 +277,7 @@ func (a *bunAdapter) RemovePolicies(sec string, ptype string, rules [][]string)
 
 func (a *bunAdapter) deleteRecord(existingPolicy CasbinPolicy) error {
 	query := a.db.NewDelete().
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", existingPolicy.PType)
 
 	values := existingPolicy.filterValuesWithKey()
@@ -284,7 +287,7 @@ func (a *bunAdapter) deleteRecord(existingPolicy CasbinPolicy) error {
 
 func (a *bunAdapter) deleteRecordInTx(tx bun.Tx, existingPolicy CasbinPolicy) error {
 	query := tx.NewDelete().
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", existingPolicy.PType)
 
 	values := existingPolicy.filterValuesWithKey()
@@ -317,7 +320,7 @@ func (a *bunAdapter) RemoveFilteredPolicy(sec string, ptype string, fieldIndex i
 
 func (a *bunAdapter) deleteFilteredPolicy(ptype string, fieldIndex int, fieldValues ...string) error {
 	query := a.db.NewDelete().
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", ptype)
 
 	// Note that empty string in fieldValues could be any word.
@@ -388,7 +391,7 @@ func (a *bunAdapter) UpdatePolicy(sec string, ptype string, oldRule, newRule []s
 func (a *bunAdapter) updateRecord(oldPolicy, newPolicy CasbinPolicy) error {
 	query := a.db.NewUpdate().
 		Model(&newPolicy).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", oldPolicy.PType)
 
 	values := oldPolicy.filterValuesWithKey()
@@ -399,7 +402,7 @@ func (a *bunAdapter) updateRecord(oldPolicy, newPolicy CasbinPolicy) error {
 func (a *bunAdapter) updateRecordInTx(tx bun.Tx, oldPolicy, newPolicy CasbinPolicy) error {
 	query := tx.NewUpdate().
 		Model(&newPolicy).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", oldPolicy.PType)
 
 	values := oldPolicy.filterValuesWithKey()
@@ -453,10 +456,10 @@ func (a *bunAdapter) UpdateFilteredPolicies(sec string, ptype string, newRules [
 	}
 
 	selectQuery := tx.NewSelect().
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", ptype)
 	deleteQuery := tx.NewDelete().
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Where("ptype = ?", ptype)
 
 	// Note that empty string in fieldValues could be any word.
@@ -541,7 +544,7 @@ func (a *bunAdapter) UpdateFilteredPolicies(sec string, ptype string, newRules [
 	// create new policies
 	if _, err := tx.NewInsert().
 		Model(&newPolicies).
-		Table(a.tableName).
+		ModelTableExpr(a.tableName).
 		Exec(context.Background()); err != nil {
 		if err := tx.Rollback(); err != nil {
 			return nil, err