dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-03-30 20:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rory&
2026-03-20 15:00:49 +01:00
parent 6438953a4b
commit 928da652a0
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/entities/BaseClass.ts
View File

@@ -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()

6
src/util/entities/Categories.ts
View File

@@ -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 })

6
src/util/entities/Config.ts
View File

@@ -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 })

6
src/util/entities/ConnectionConfigEntity.ts
View File

@@ -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 })

6
src/util/entities/Invite.ts
View File

@@ -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()

6
src/util/entities/UserSettingsProtos.ts
View File

@@ -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" })