Skip to content

Commit 0787f7b

Browse files
RKrahlRKrahl
committed
Fixup 8950735: old ICAT versions do not support selecting related
object's attributes in JPQL queries
1 parent 899934f commit 0787f7b

1 file changed

Lines changed: 26 additions & 13 deletions

File tree

‎tests/test_06_ingest.py‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ class MyIngestReader(IngestReader):
113113
"testingest_inl_1": [
114114
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
115115
False),
116-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
116+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
117+
"WHERE ds.id = %d"),
117118
"raw"),
118119
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
119120
"Dy01Cp02 at 2.7 K"),
@@ -133,7 +134,8 @@ class MyIngestReader(IngestReader):
133134
"testingest_inl_2": [
134135
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
135136
False),
136-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
137+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
138+
"WHERE ds.id = %d"),
137139
"raw"),
138140
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
139141
"Dy01Cp02 at 5.1 K"),
@@ -160,7 +162,8 @@ class MyIngestReader(IngestReader):
160162
"testingest_inl5_1": [
161163
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
162164
False),
163-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
165+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
166+
"WHERE ds.id = %d"),
164167
"raw"),
165168
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
166169
"Dy01Cp02 at 2.7 K"),
@@ -188,7 +191,8 @@ class MyIngestReader(IngestReader):
188191
"testingest_inl5_2": [
189192
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
190193
False),
191-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
194+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
195+
"WHERE ds.id = %d"),
192196
"raw"),
193197
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
194198
"Dy01Cp02 at 5.1 K"),
@@ -226,7 +230,8 @@ class MyIngestReader(IngestReader):
226230
"testingest_sep_1": [
227231
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
228232
False),
229-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
233+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
234+
"WHERE ds.id = %d"),
230235
"raw"),
231236
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
232237
"Dy01Cp02 at 2.7 K"),
@@ -246,7 +251,8 @@ class MyIngestReader(IngestReader):
246251
"testingest_sep_2": [
247252
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
248253
False),
249-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
254+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
255+
"WHERE ds.id = %d"),
250256
"raw"),
251257
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
252258
"Dy01Cp02 at 5.1 K"),
@@ -273,7 +279,8 @@ class MyIngestReader(IngestReader):
273279
"testingest_sep5_1": [
274280
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
275281
False),
276-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
282+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
283+
"WHERE ds.id = %d"),
277284
"raw"),
278285
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
279286
"Dy01Cp02 at 2.7 K"),
@@ -301,7 +308,8 @@ class MyIngestReader(IngestReader):
301308
"testingest_sep5_2": [
302309
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
303310
False),
304-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
311+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
312+
"WHERE ds.id = %d"),
305313
"raw"),
306314
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
307315
"Dy01Cp02 at 5.1 K"),
@@ -340,7 +348,8 @@ class MyIngestReader(IngestReader):
340348
"testingest_sample_1": [
341349
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
342350
False),
343-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
351+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
352+
"WHERE ds.id = %d"),
344353
"raw"),
345354
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
346355
"ab3465 at 2.7 K"),
@@ -358,7 +367,8 @@ class MyIngestReader(IngestReader):
358367
"testingest_sample_2": [
359368
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
360369
False),
361-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
370+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
371+
"WHERE ds.id = %d"),
362372
"raw"),
363373
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
364374
"ab3465 at 5.1 K"),
@@ -376,7 +386,8 @@ class MyIngestReader(IngestReader):
376386
"testingest_sample_3": [
377387
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
378388
False),
379-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
389+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
390+
"WHERE ds.id = %d"),
380391
"raw"),
381392
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
382393
"ab3466 at 2.7 K"),
@@ -394,7 +405,8 @@ class MyIngestReader(IngestReader):
394405
"testingest_sample_4": [
395406
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
396407
False),
397-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
408+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
409+
"WHERE ds.id = %d"),
398410
"raw"),
399411
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
400412
"reference"),
@@ -723,7 +735,8 @@ def test_ingest_error_searcherr(client, investigation, schemadir, case):
723735
"testingest_classattr_1": [
724736
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
725737
True),
726-
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
738+
(("SELECT t.name FROM DatasetType t JOIN t.datasets AS ds "
739+
"WHERE ds.id = %d"),
727740
"other"),
728741
],
729742
},

0 commit comments

Comments
 (0)