Make query builder use Table API to access the table name

This allows for easier building custom data records that use an existing table
digitallyinduced · Feb 8, 2022 · 92f0679 · 92f0679
1 parent 02441a6
commit 92f0679
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 54 deletions.
diff --git a/IHP/ModelSupport.hs b/IHP/ModelSupport.hs
@@ -48,6 +48,7 @@ import Data.Dynamic
 import Data.Scientific
 import GHC.Stack
 import qualified Numeric
+import qualified Data.Text.Encoding as Text
 
 -- | Provides the db connection and some IHP-specific db configuration
 data ModelContext = ModelContext
@@ -533,7 +534,7 @@ class
     -- "users"
     --
     tableNameByteString :: ByteString
-    tableNameByteString = symbolToByteString @(GetTableName record)
+    tableNameByteString = Text.encodeUtf8 (tableName @record)
     {-# INLINE tableNameByteString #-}
 
     -- | Returns the list of column names for a given model

diff --git a/IHP/Pagination/ControllerFunctions.hs b/IHP/Pagination/ControllerFunctions.hs
@@ -23,7 +23,7 @@ import IHP.QueryBuilder
     ( HasQueryBuilder, filterWhereILike, limit, offset )
 import IHP.Fetch (fetchCount)
 
-import IHP.ModelSupport (GetModelByTableName, sqlQuery, sqlQueryScalar)
+import IHP.ModelSupport (GetModelByTableName, sqlQuery, sqlQueryScalar, Table)
 
 import Database.PostgreSQL.Simple.ToField (toField, Action)
 import Database.PostgreSQL.Simple.Types (Query(Query))
@@ -131,7 +131,9 @@ filterList :: forall name table model queryBuilderProvider joinRegister .
     , HasField name model Text
     , model ~ GetModelByTableName table
     , KnownSymbol table
-    , HasQueryBuilder queryBuilderProvider joinRegister) =>
+    , HasQueryBuilder queryBuilderProvider joinRegister
+    , Table model
+    ) =>
     Proxy name
     -> queryBuilderProvider table
     -> queryBuilderProvider table