Skip to content

Add agency_id to primary key for agency. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scrudden wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Add agency_id to primary key for agency. #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d610e1
Add agency_id to primary key for agency.
scrudden Jan 12, 2019
6373d58
Add database create SQL scripts. These really should be deleted as th…
scrudden Jan 12, 2019
34b4cd8
Revert "Add database create SQL scripts. These really should be delet…
scrudden Jan 12, 2019
7efdbf3
Add correct SQL files with latest database create scripts.
scrudden Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion transitclock/src/main/java/org/transitclock/db/structs/Agency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public class Agency implements Serializable {

// Note: this is the GTFS agency_id, not the usual
// Transitime agencyId.
@Column(length=HibernateUtils.DEFAULT_ID_SIZE)
@Column(length=HibernateUtils.DEFAULT_ID_SIZE)
@Id
private final String agencyId;

@Column
Expand Down
4 changes: 2 additions & 2 deletions ...s/ddl_mysql_org_transitime_db_structs.sql → ...ddl_mysql_org_transitclock_db_structs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
create table Agencies (
configRev integer not null,
agencyName varchar(60) not null,
agencyId varchar(60) not null,
agencyFareUrl varchar(255),
agencyId varchar(60),
agencyLang varchar(15),
agencyPhone varchar(15),
agencyTimezone varchar(40),
Expand All @@ -19,7 +19,7 @@
maxLon double precision,
minLat double precision,
minLon double precision,
primary key (configRev, agencyName)
primary key (configRev, agencyName, agencyId)
);

create table ArrivalsDepartures (
Expand Down
0 ...dl_mysql_org_transitime_db_webstructs.sql → ..._mysql_org_transitclock_db_webstructs.sql
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../ddl_oracle_org_transitime_db_structs.sql → ...dl_oracle_org_transitclock_db_structs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
create table Agencies (
configRev number(10,0) not null,
agencyName varchar2(60 char) not null,
agencyId varchar2(60 char) not null,
agencyFareUrl varchar2(255 char),
agencyId varchar2(60 char),
agencyLang varchar2(15 char),
agencyPhone varchar2(15 char),
agencyTimezone varchar2(40 char),
Expand All @@ -19,7 +19,7 @@
maxLon double precision,
minLat double precision,
minLon double precision,
primary key (configRev, agencyName)
primary key (configRev, agencyName, agencyId)
);

create table ArrivalsDepartures (
Expand Down
0 ...l_oracle_org_transitime_db_webstructs.sql → ...oracle_org_transitclock_db_webstructs.sql
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...dl_postgres_org_transitime_db_structs.sql → ..._postgres_org_transitclock_db_structs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
create table Agencies (
configRev int4 not null,
agencyName varchar(60) not null,
agencyId varchar(60) not null,
agencyFareUrl varchar(255),
agencyId varchar(60),
agencyLang varchar(15),
agencyPhone varchar(15),
agencyTimezone varchar(40),
Expand All @@ -19,7 +19,7 @@
maxLon float8,
minLat float8,
minLon float8,
primary key (configRev, agencyName)
primary key (configRev, agencyName, agencyId)
);

create table ArrivalsDepartures (
Expand Down
0 ...postgres_org_transitime_db_webstructs.sql → ...stgres_org_transitclock_db_webstructs.sql
View file
Open in desktop
File renamed without changes.