Commit eae13b37 authored 10 years ago by anttil

SSDM-555: Merge from feature branch to trunk

* Fix problems from 139-140 migration
* Remove dbin_id from these tables: scripts, queries, filters, grid_custom_columns, property_types, controlled_vocabularies, file_format_types, external_data_management_systems, relationship_types

SVN: 31918

parent 58bad7ff

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java 0 additions, 1 deletion

...ch/systemsx/cisd/openbis/generic/server/CommonServer.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java 0 additions, 1 deletion

...sd/openbis/generic/server/business/bo/PropertyTypeBO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBO.java 0 additions, 1 deletion

...msx/cisd/openbis/generic/server/business/bo/ScriptBO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java 0 additions, 1 deletion

...cisd/openbis/generic/server/business/bo/VocabularyBO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java 2 additions, 2 deletions

...neric/server/business/bo/datasetlister/DatasetLister.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java 4 additions, 5 deletions

...erver/business/bo/datasetlister/IDatasetListingQuery.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractTypeDAO.java 0 additions, 4 deletions

...openbis/generic/server/dataaccess/db/AbstractTypeDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.java 1 addition, 1 deletion

...s/generic/server/dataaccess/db/DatabaseVersionHolder.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAO.java 0 additions, 1 deletion

...server/dataaccess/db/ExternalDataManagementSystemDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java 1 addition, 5 deletions

...enbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAO.java 0 additions, 3 deletions

...bis/generic/server/dataaccess/db/GridCustomColumnDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAO.java 0 additions, 4 deletions

...bis/generic/server/dataaccess/db/GridCustomFilterDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAO.java 0 additions, 4 deletions

...x/cisd/openbis/generic/server/dataaccess/db/QueryDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RelationshipTypeDAO.java 2 additions, 2 deletions

...bis/generic/server/dataaccess/db/RelationshipTypeDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAO.java 2 additions, 3 deletions

.../cisd/openbis/generic/server/dataaccess/db/ScriptDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAO.java 7 additions, 8 deletions

...d/openbis/generic/server/dataaccess/db/VocabularyDAO.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractExpressionPE.java 0 additions, 18 deletions

...cisd/openbis/generic/shared/dto/AbstractExpressionPE.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataManagementSystemPE.java 0 additions, 18 deletions

...is/generic/shared/dto/ExternalDataManagementSystemPE.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java 2 additions, 21 deletions

...msx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomColumnPE.java 0 additions, 2 deletions

...x/cisd/openbis/generic/shared/dto/GridCustomColumnPE.java

with 21 additions and 105 deletions

Please register or to comment