@@ -18,7 +18,7 @@ import { injectQueryBuilder } from "../qb.provider"
18
18
import type { IQueryBuilder } from "../qb.type"
19
19
import { json } from "../qb.util"
20
20
import { UnderlyingTableService } from "../underlying/underlying-table.service"
21
- import { TableDbQuerySpecHandler } from "./table-db.query-spec-handler "
21
+ import { TableFilterVisitor } from "./table.filter-visitor "
22
22
import { TableMapper } from "./table.mapper"
23
23
import { TableMutationVisitor } from "./table.mutation-visitor"
24
24
import { TableReferenceVisitor } from "./table.reference-visitor"
@@ -179,9 +179,7 @@ export class TableRepository implements ITableRepository {
179
179
. selectFrom ( "undb_table" )
180
180
. selectAll ( "undb_table" )
181
181
. $if ( spec . isSome ( ) , ( qb ) => new TableReferenceVisitor ( qb ) . call ( spec . unwrap ( ) ) )
182
- . where ( ( eb ) =>
183
- new TableDbQuerySpecHandler ( tx , eb , this . context . mustGetCurrentSpaceId ( ) , ignoreSpace ) . handle ( spec ) ,
184
- )
182
+ . where ( ( eb ) => new TableFilterVisitor ( tx , eb , this . context . mustGetCurrentSpaceId ( ) , ignoreSpace ) . $where ( spec ) )
185
183
const tbs = await query . execute ( )
186
184
187
185
return tbs . map ( ( t ) => this . mapper . toDo ( t ) )
@@ -193,7 +191,7 @@ export class TableRepository implements ITableRepository {
193
191
. selectFrom ( "undb_table" )
194
192
. selectAll ( "undb_table" )
195
193
. $if ( spec . isSome ( ) , ( qb ) => new TableReferenceVisitor ( qb ) . call ( spec . unwrap ( ) ) )
196
- . where ( ( eb ) => new TableDbQuerySpecHandler ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . handle ( spec ) )
194
+ . where ( ( eb ) => new TableFilterVisitor ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . $where ( spec ) )
197
195
. executeTakeFirst ( )
198
196
199
197
if ( ! tb ) {
@@ -210,7 +208,7 @@ export class TableRepository implements ITableRepository {
210
208
. selectFrom ( "undb_table" )
211
209
. selectAll ( "undb_table" )
212
210
. $call ( ( qb ) => new TableReferenceVisitor ( qb ) . call ( spec . unwrap ( ) ) )
213
- . where ( ( eb ) => new TableDbQuerySpecHandler ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . handle ( spec ) )
211
+ . where ( ( eb ) => new TableFilterVisitor ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . $where ( spec ) )
214
212
. executeTakeFirst ( )
215
213
216
214
return tb ? Some ( this . mapper . toDo ( tb ) ) : None
@@ -223,7 +221,7 @@ export class TableRepository implements ITableRepository {
223
221
. selectFrom ( "undb_table" )
224
222
. selectAll ( "undb_table" )
225
223
. $call ( ( qb ) => new TableReferenceVisitor ( qb ) . call ( spec . unwrap ( ) ) )
226
- . where ( ( eb ) => new TableDbQuerySpecHandler ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . handle ( spec ) )
224
+ . where ( ( eb ) => new TableFilterVisitor ( tx , eb , this . context . mustGetCurrentSpaceId ( ) ) . $where ( spec ) )
227
225
. execute ( )
228
226
229
227
return tbs . map ( ( t ) => this . mapper . toDo ( t ) )
0 commit comments