Skip to content

Commit 9074900

Browse files
nichenqinnichenqin
committed
fix: fix db provider
1 parent 88a00af commit 9074900

File tree

8 files changed

+19
-28
lines changed

8 files changed

+19
-28
lines changed

‎packages/persistence/src/dashboard/dashboard.mutate-visitor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class DashboardMutateVisitor extends AbstractQBMutationVisitor implements
6060
.insertInto("undb_dashboard_table_id_mapping")
6161
.values({ dashboard_id: dashboardId, table_id: tableId })
6262
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
63-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
63+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
6464
.compile()
6565
this.addSql(sql)
6666
}

‎packages/persistence/src/db.provider.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { inject, singleton } from "@undb/di"
1+
import { inject, injectable } from "@undb/di"
22

33
export const DB_PROVIDER = Symbol.for("DB_PROVIDER")
44

@@ -7,29 +7,20 @@ export const injectDbProvider = () => inject(DB_PROVIDER)
77
export interface IDbProvider {
88
getDbProvider(): string
99

10-
get not(): this
11-
1210
isPostgres(): boolean
1311
isMysql(): boolean
1412
isSqlite(): boolean
1513
}
1614

17-
@singleton()
15+
@injectable()
1816
export class DbProviderService implements IDbProvider {
1917
constructor(@inject(DB_PROVIDER) private readonly dbProvider: string) {}
2018

21-
#isNot: boolean = false
22-
23-
get not(): this {
24-
this.#isNot = true
25-
return this
26-
}
27-
2819
getDbProvider(): string {
2920
return this.dbProvider
3021
}
3122
#is(dbProvider: string) {
32-
return this.#isNot ? this.dbProvider !== dbProvider : this.dbProvider === dbProvider
23+
return this.dbProvider === dbProvider
3324
}
3425
isPostgres(): boolean {
3526
return this.#is("postgres")

‎packages/persistence/src/member/invitation.repository.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class InvitationRepository implements IInvitationRepository {
5757
role: invitation.role,
5858
}),
5959
)
60-
.$if(this.dbProvider.not.isMysql(), (eb) =>
60+
.$if(!this.dbProvider.isMysql(), (eb) =>
6161
eb.onConflict((oc) =>
6262
oc.columns(["id", "email"]).doUpdateSet({
6363
invited_at: new Date(),

‎packages/persistence/src/member/space-member.repository.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class SpaceMemberRepository implements ISpaceMemberRepository {
7575
user_id: json.userId,
7676
})
7777
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
78-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((c) => c.doNothing()))
78+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((c) => c.doNothing()))
7979
.execute()
8080
}
8181
}

‎packages/persistence/src/record/record.mutate-visitor.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export class RecordMutateVisitor extends AbstractQBMutationVisitor implements IR
216216
}),
217217
)
218218
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
219-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((bd) => bd.columns(["id"]).doNothing()))
219+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((bd) => bd.columns(["id"]).doNothing()))
220220
.compile()
221221
this.addSql(insert)
222222

@@ -231,7 +231,7 @@ export class RecordMutateVisitor extends AbstractQBMutationVisitor implements IR
231231
})),
232232
)
233233
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
234-
.$if(this.dbProvider.not.isMysql(), (eb) =>
234+
.$if(!this.dbProvider.isMysql(), (eb) =>
235235
eb.onConflict((bd) => bd.columns(["table_id", "field_id", "record_id", "attachment_id"]).doNothing()),
236236
)
237237
.compile()
@@ -284,7 +284,7 @@ export class RecordMutateVisitor extends AbstractQBMutationVisitor implements IR
284284
return values.reduce((prev, value) => prev.unionAll(expression(value)), expression(values[0]))
285285
})
286286
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
287-
.$if(this.dbProvider.not.isMysql(), (eb) =>
287+
.$if(!this.dbProvider.isMysql(), (eb) =>
288288
eb.onConflict((bd) => bd.columns([fieldId, symmetricFieldId]).doNothing()),
289289
)
290290
.compile()
@@ -315,7 +315,7 @@ export class RecordMutateVisitor extends AbstractQBMutationVisitor implements IR
315315
})),
316316
)
317317
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
318-
.$if(this.dbProvider.not.isMysql(), (eb) =>
318+
.$if(!this.dbProvider.isMysql(), (eb) =>
319319
eb.onConflict((bd) => bd.columns([fieldId, symmetricFieldId]).doNothing()),
320320
)
321321
.compile()

‎packages/persistence/src/share/share.repository.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class ShareRepository implements IShareRepository {
3232
.insertInto("undb_share")
3333
.values(entity)
3434
.$if(this.dbProvider.isMysql(), (eb) => eb.onDuplicateKeyUpdate({ enabled: share.enabled }))
35-
.$if(this.dbProvider.not.isMysql(), (eb) =>
35+
.$if(!this.dbProvider.isMysql(), (eb) =>
3636
eb.onConflict((ob) => ob.columns(["target_id", "target_type"]).doUpdateSet({ enabled: share.enabled })),
3737
)
3838
.execute()

‎packages/persistence/src/table/table.mutation-visitor.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
7979
subject_id: field.id.value,
8080
})
8181
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
82-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
82+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
8383
.compile()
8484
this.addSql(sql)
8585

@@ -95,7 +95,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
9595
rollup_table_id: this.table.id.value,
9696
})
9797
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
98-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
98+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
9999
.compile()
100100
this.addSql(sql)
101101
} else if (field.type === "reference") {
@@ -108,7 +108,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
108108
foreign_table_id: field.foreignTableId,
109109
})
110110
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
111-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
111+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
112112
.compile()
113113

114114
this.addSql(sql)
@@ -171,7 +171,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
171171
subject_id: views.view.id.value,
172172
})
173173
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
174-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
174+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
175175
.compile()
176176

177177
this.addSql(sql)
@@ -224,7 +224,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
224224
subject_id: views.form.id,
225225
})
226226
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
227-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
227+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
228228
.compile()
229229

230230
this.addSql(sql)

‎packages/persistence/src/table/table.repository.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export class TableRepository implements ITableRepository {
104104
.insertInto("undb_table_id_mapping")
105105
.values(mapping)
106106
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
107-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
107+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
108108
.execute()
109109

110110
for (const view of table.views.views) {
@@ -115,7 +115,7 @@ export class TableRepository implements ITableRepository {
115115
subject_id: view.id.value,
116116
})
117117
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
118-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
118+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
119119
.execute()
120120
}
121121

@@ -127,7 +127,7 @@ export class TableRepository implements ITableRepository {
127127
subject_id: form.id,
128128
})
129129
.$if(this.dbProvider.isMysql(), (eb) => eb.ignore())
130-
.$if(this.dbProvider.not.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
130+
.$if(!this.dbProvider.isMysql(), (eb) => eb.onConflict((ob) => ob.doNothing()))
131131
.execute()
132132
}
133133

0 commit comments

Comments
 (0)