Skip to content

Commit dc5a1cf

Browse files
authored
Merge pull request #132 from OpenDataAlex/process_tracker_python-116
Process tracker python 116
2 parents f3c9d06 + 60b55ac commit dc5a1cf

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

dbscripts/mysql_process_tracker.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ create index process_run_actor_id
350350
create index process_status_id
351351
on process_tracking (process_status_id);
352352

353-
create table process_tracker.cluster_tracking
353+
create table process_tracker.cluster_tracking_lkup
354354
(
355355
cluster_id int auto_increment
356356
primary key,
@@ -372,7 +372,7 @@ create table process_tracker.cluster_process
372372
process_id int not null,
373373
primary key (cluster_id, process_id),
374374
constraint cluster_process_fk01
375-
foreign key (cluster_id) references process_tracker.cluster_tracking (cluster_id),
375+
foreign key (cluster_id) references process_tracker.cluster_tracking_lkup (cluster_id),
376376
constraint cluster_process_fk02
377377
foreign key (process_id) references process_tracker.process (process_id)
378378
)

dbscripts/postgresql_process_tracker.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ comment on table extract_dependency is 'Table tracking interdependencies between
547547

548548
alter table extract_dependency owner to pt_admin;
549549

550-
create table cluster_tracking
550+
create table cluster_tracking_lkup
551551
(
552552
cluster_id serial not null
553553
constraint cluster_tracking_pk
@@ -561,18 +561,18 @@ create table cluster_tracking
561561
cluster_current_process_usage integer
562562
);
563563

564-
comment on table cluster_tracking is 'Capacity cluster tracking';
564+
comment on table cluster_tracking_lkup is 'Capacity cluster tracking';
565565

566-
alter table cluster_tracking owner to pt_admin;
566+
alter table cluster_tracking_lkup owner to pt_admin;
567567

568568
create unique index cluster_tracking_cluster_name_uindex
569-
on cluster_tracking (cluster_name);
569+
on cluster_tracking_lkup (cluster_name);
570570

571571
create table cluster_process
572572
(
573573
cluster_id integer not null
574574
constraint cluster_process_fk01
575-
references cluster_tracking,
575+
references cluster_tracking_lkup,
576576
process_id integer not null
577577
constraint cluster_process_fk02
578578
references process,

process_tracker/models/capacity.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
class Cluster(Base):
1212

13-
__tablename__ = "cluster_tracking"
13+
__tablename__ = "cluster_tracking_lkup"
1414
__table_args__ = {"schema": "process_tracker"}
1515

1616
cluster_id = Column(
1717
Integer,
18-
Sequence("cluster_tracking_cluster_id_seq", schema="process_tracker"),
18+
Sequence("cluster_tracking_lkup_cluster_id_seq", schema="process_tracker"),
1919
primary_key=True,
2020
nullable=False,
2121
)
@@ -41,7 +41,7 @@ class ClusterProcess(Base):
4141

4242
cluster_id = Column(
4343
Integer,
44-
ForeignKey("process_tracker.cluster_tracking.cluster_id"),
44+
ForeignKey("process_tracker.cluster_tracking_lkup.cluster_id"),
4545
primary_key=True,
4646
nullable=False,
4747
)

0 commit comments

Comments
 (0)