Skip to content

Commit 60b46dc

Browse files
committed
fix: use select MAX() instead of gorm
1 parent c8149cb commit 60b46dc

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/testutils.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ func EmptyTable(dataSource *utils.DbAndSchema, tableName string) {
108108

109109
func GetLastCohortId() int {
110110
dataSource := db.GetAtlasDB()
111-
var lastCohortDefinition models.CohortDefinition
112-
dataSource.Db.Select("id").Order("id DESC").First(&lastCohortDefinition)
113-
return lastCohortDefinition.Id
111+
var lastCohortDefinitionId int
112+
dataSource.Db.Raw("SELECT MAX(id) FROM " + dataSource.Schema + ".cohort_definition").Scan(&lastCohortDefinitionId)
113+
return lastCohortDefinitionId
114114
}
115115

116116
func GetNextCohortId() int {
@@ -123,25 +123,25 @@ func GetNextCohortId() int {
123123

124124
func GetLastConceptId(sourceId int) int64 {
125125
dataSource := GetOmopDataSourceForSourceId(sourceId)
126-
var lastConcept models.Concept
127-
dataSource.Db.Select("concept_id").Order("concept_id DESC").First(&lastConcept)
126+
var lastConceptId int64
127+
dataSource.Db.Raw("SELECT MAX(concept_id) FROM " + dataSource.Schema + ".concept").Scan(&lastConceptId)
128128
log.Printf("Last concept id found %d",
129-
lastConcept.ConceptId)
130-
return lastConcept.ConceptId
129+
lastConceptId)
130+
return lastConceptId
131131
}
132132

133133
func GetLastObservationId(sourceId int) int64 {
134134
dataSource := GetOmopDataSourceForSourceId(sourceId)
135-
var lastObservation models.Observation
136-
dataSource.Db.Select("observation_id").Order("observation_id DESC").First(&lastObservation)
137-
return lastObservation.ObservationId
135+
var lastObservationId int64
136+
dataSource.Db.Raw("SELECT MAX(observation_id) FROM " + dataSource.Schema + ".observation").Scan(&lastObservationId)
137+
return lastObservationId
138138
}
139139

140140
func GetLastPersonId(sourceId int) int64 {
141141
dataSource := GetOmopDataSourceForSourceId(sourceId)
142-
var lastPerson models.Person
143-
dataSource.Db.Select("person_id").Order("person_id DESC").First(&lastPerson)
144-
return lastPerson.PersonId
142+
var lastPersonId int64
143+
dataSource.Db.Raw("SELECT MAX(person_id) FROM " + dataSource.Schema + ".person").Scan(&lastPersonId)
144+
return lastPersonId
145145
}
146146

147147
func GetOmopDataSource() *utils.DbAndSchema {

0 commit comments

Comments
 (0)