mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-09-28 21:20:46 +00:00
d7b3fb972c
Summary: upgrade typeorm version, so Grist can run against newer versions of postgres. Dusted off some old benchmarking code to verify that important queries don't get slower. They don't appear to, unlike for some intermediate versions of typeorm I tried in the past. Most of the changes are because `findOne` changed how it interprets its arguments, and the value it returns when nothing is found. For the return value, I stuck with limiting its impact by emulating old behavior (returning undefined rather than null) rather than propagating the change out to parts of the code unrelated to the database. Test Plan: existing tests pass; manual testing with postgres 10 and 14 Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D3613
59 lines
1.4 KiB
TypeScript
59 lines
1.4 KiB
TypeScript
import {BaseEntity, ChildEntity, Column, Entity, JoinColumn, ManyToOne, OneToOne,
|
|
PrimaryGeneratedColumn, RelationId, TableInheritance} from "typeorm";
|
|
|
|
import {Document} from "./Document";
|
|
import {Group} from "./Group";
|
|
import {Organization} from "./Organization";
|
|
import {Workspace} from "./Workspace";
|
|
|
|
@Entity('acl_rules')
|
|
@TableInheritance({ column: { type: "int", name: "type" } })
|
|
export class AclRule extends BaseEntity {
|
|
|
|
@PrimaryGeneratedColumn()
|
|
public id: number;
|
|
|
|
@Column()
|
|
public permissions: number;
|
|
|
|
@OneToOne(type => Group, group => group.aclRule)
|
|
@JoinColumn({name: "group_id"})
|
|
public group: Group;
|
|
}
|
|
|
|
|
|
@ChildEntity()
|
|
export class AclRuleWs extends AclRule {
|
|
|
|
@ManyToOne(type => Workspace, workspace => workspace.aclRules)
|
|
@JoinColumn({name: "workspace_id"})
|
|
public workspace: Workspace;
|
|
|
|
@RelationId((aclRule: AclRuleWs) => aclRule.workspace)
|
|
public workspaceId: number;
|
|
}
|
|
|
|
|
|
@ChildEntity()
|
|
export class AclRuleOrg extends AclRule {
|
|
|
|
@ManyToOne(type => Organization, organization => organization.aclRules)
|
|
@JoinColumn({name: "org_id"})
|
|
public organization: Organization;
|
|
|
|
@RelationId((aclRule: AclRuleOrg) => aclRule.organization)
|
|
public orgId: number;
|
|
}
|
|
|
|
|
|
@ChildEntity()
|
|
export class AclRuleDoc extends AclRule {
|
|
|
|
@ManyToOne(type => Document, document => document.aclRules)
|
|
@JoinColumn({name: "doc_id"})
|
|
public document: Document;
|
|
|
|
@RelationId((aclRule: AclRuleDoc) => aclRule.document)
|
|
public docId: string;
|
|
}
|