Remove PrimaryIdColumn (only for what used to be mongodb support)

6 files changed, 17 insertions, 19 deletions

diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts

index 24a3aee1..7a718cc0 100644
--- a/src/util/entities/BaseClass.ts
+++ b/src/util/entities/BaseClass.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, ColumnOptions, FindOptionsWhere, ObjectIdColumn, PrimaryColumn } from "typeorm";
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, ColumnOptions, FindOptionsWhere, PrimaryColumn } from "typeorm";
 import { Snowflake, getDatabase } from "../util";
 import { OrmUtils } from "../imports";
 import { annotationsKey } from "../util/Decorators";
@@ -112,10 +112,8 @@ export class BaseClassWithoutId extends BaseEntity {
     }
 }
 
-export const PrimaryIdColumn = process.env.DATABASE?.startsWith("mongodb") ? ObjectIdColumn : PrimaryColumn;
-
 export class BaseClass extends BaseClassWithoutId {
-    @PrimaryIdColumn()
+    @PrimaryColumn()
     id: string = Snowflake.generate();
 
     @BeforeUpdate()
diff --git a/src/util/entities/Categories.ts b/src/util/entities/Categories.ts

index 83201864..2c45217c 100644
--- a/src/util/entities/Categories.ts
+++ b/src/util/entities/Categories.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Column, Entity } from "typeorm";
-import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { Column, Entity, PrimaryColumn } from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
 
 // TODO: categories:
 // [{
@@ -39,7 +39,7 @@ import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
 export class Categories extends BaseClassWithoutId {
     // Not using snowflake
 
-    @PrimaryIdColumn()
+    @PrimaryColumn()
     id: number;
 
     @Column({ nullable: true })
diff --git a/src/util/entities/Config.ts b/src/util/entities/Config.ts

index af53eb22..7d4e05af 100644
--- a/src/util/entities/Config.ts
+++ b/src/util/entities/Config.ts
@@ -16,14 +16,14 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Column, Entity } from "typeorm";
-import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { Column, Entity, PrimaryColumn } from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
 
 @Entity({
     name: "config",
 })
 export class ConfigEntity extends BaseClassWithoutId {
-    @PrimaryIdColumn()
+    @PrimaryColumn()
     key: string;
 
     @Column({ type: "simple-json", nullable: true })
diff --git a/src/util/entities/ConnectionConfigEntity.ts b/src/util/entities/ConnectionConfigEntity.ts

index b10f5766..9ad2af8b 100644
--- a/src/util/entities/ConnectionConfigEntity.ts
+++ b/src/util/entities/ConnectionConfigEntity.ts
@@ -16,14 +16,14 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Column, Entity } from "typeorm";
-import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { Column, Entity, PrimaryColumn } from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
 
 @Entity({
     name: "connection_config",
 })
 export class ConnectionConfigEntity extends BaseClassWithoutId {
-    @PrimaryIdColumn()
+    @PrimaryColumn()
     key: string;
 
     @Column({ type: "simple-json", nullable: true })
diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts

index 20346883..cc5374eb 100644
--- a/src/util/entities/Invite.ts
+++ b/src/util/entities/Invite.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn, RelationId } from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
 import { Channel } from "./Channel";
 import { Guild } from "./Guild";
 import { Member } from "./Member";
@@ -29,7 +29,7 @@ export const PublicInviteRelation = ["inviter", "guild", "channel"];
     name: "invites",
 })
 export class Invite extends BaseClassWithoutId {
-    @PrimaryIdColumn()
+    @PrimaryColumn()
     code: string;
 
     @Column()
diff --git a/src/util/entities/UserSettingsProtos.ts b/src/util/entities/UserSettingsProtos.ts

index a3c1e4fb..c8ee9d12 100644
--- a/src/util/entities/UserSettingsProtos.ts
+++ b/src/util/entities/UserSettingsProtos.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Column, Entity, JoinColumn, OneToOne } from "typeorm";
-import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
+import { Column, Entity, JoinColumn, OneToOne, PrimaryColumn } from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
 import { User } from "./User";
 import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos";
 
@@ -33,7 +33,7 @@ export class UserSettingsProtos extends BaseClassWithoutId {
     @JoinColumn({ name: "user_id" })
     user: User;
 
-    @PrimaryIdColumn({ type: "text" })
+    @PrimaryColumn({ type: "text" })
     user_id: string;
 
     @Column({ nullable: true, type: String, name: "userSettings" })