Skip to content
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

Added extra columns for names locations #7038

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Added extra columns for names locations #7038

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
ad6ae5d
Added extra columns for names locations
Camelia-Orcid Jun 3, 2024
457994b
added the dbms to fix failing tests
Camelia-Orcid Jun 3, 2024
27c4927
Separate changeset for hsqldb to fix failing tests
Camelia-Orcid Jun 3, 2024
398361e
Fixed formatting to follow Orcid rules
Camelia-Orcid Jun 4, 2024
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
26 changes: 25 additions & 1 deletion ...-persistence/src/main/java/org/orcid/persistence/jpa/entities/OrgDisambiguatedEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,28 @@ public void setMemberChosenOrgDisambiguatedEntity(MemberChosenOrgDisambiguatedEn
this.memberChosenOrgDisambiguatedEntity = memberChosenOrgDisambiguatedEntity;
}

}
@Column(name = "locations_json")
private String locationsJson;

@Column(name = "locations_json")
public String getLocationsJson() {
return locationsJson;
}

public void setLocationsJson(String locationsJson) {
this.locationsJson = locationsJson;
}

@Column(name = "names_json")
private String namesJson;

@Column(name = "names_json")
public String getNamesJson() {
return namesJson;
}

public void setNamesJson(String namesJson) {
this.namesJson = namesJson;
}

}
3 changes: 2 additions & 1 deletion orcid-persistence/src/main/resources/db-master.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,5 +387,6 @@
<include file="/db/updates/dw_views_with_4_months_interval.xml" />
<include file="/db/updates/add_ip_col_in_events.xml" />
<include file="/db/updates/alter_ip_col_in_events.xml" />
<include file="/db/updates/dw_papi_event_stats.xml" />
<include file="/db/updates/dw_papi_event_stats.xml" />
<include file="/db/updates/org_disambiguated_extra_columns.xml" />
</databaseChangeLog>
21 changes: 21 additions & 0 deletions orcid-persistence/src/main/resources/db/updates/org_disambiguated_extra_columns.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">

<changeSet id="ADD-ORG-EXTRA-COLUMNS" author="Camelia Dumitru" dbms="postgresql">
<addColumn tableName="org_disambiguated">
<column name="locations_json" type="json" />
</addColumn>
<addColumn tableName="org_disambiguated">
<column name="names_json" type="json" />
</addColumn>
</changeSet>

<changeSet id="AADD-ORG-EXTRA-COLUMNS-HSQL" author="Camelia Dumitru" dbms="hsqldb">
<addColumn tableName="org_disambiguated">
<column name="locations_json" type="text" />
</addColumn>
<addColumn tableName="org_disambiguated">
<column name="names_json" type="text" />
</addColumn>
</changeSet>
</databaseChangeLog>
Loading
Loading