diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/__tests__/helpers.test.ts b/specifyweb/frontend/js_src/lib/components/DataModel/__tests__/helpers.test.ts index 1a50b7cf21e..e1983def42b 100644 --- a/specifyweb/frontend/js_src/lib/components/DataModel/__tests__/helpers.test.ts +++ b/specifyweb/frontend/js_src/lib/components/DataModel/__tests__/helpers.test.ts @@ -123,7 +123,7 @@ describe('serializeResource', () => { remarks: null, searchSynonymy: null, selectDistinct: null, - smushed: null, + selectSeries: null, specifyUser: null, sqlStr: null, timestampCreated: '2022-08-31', diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/types.ts b/specifyweb/frontend/js_src/lib/components/DataModel/types.ts index 9bf2b071d16..08d0673da04 100644 --- a/specifyweb/frontend/js_src/lib/components/DataModel/types.ts +++ b/specifyweb/frontend/js_src/lib/components/DataModel/types.ts @@ -5299,7 +5299,7 @@ export type SpQuery = { readonly remarks: string | null; readonly searchSynonymy: boolean | null; readonly selectDistinct: boolean | null; - readonly smushed: boolean | null; + readonly selectSeries: boolean | null; readonly sqlStr: string | null; readonly timestampCreated: string; readonly timestampModified: string | null; diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx index 9dc6a947bad..3b25a76424f 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx @@ -161,9 +161,9 @@ function Wrapped({ handleChange?.({ fields: unParseQueryFields(state.baseTableName, state.fields), isDistinct: query.selectDistinct, - isSeries: query.smushed, + isSeries: query.selectSeries, }); - }, [state, query.selectDistinct, query.smushed]); + }, [state, query.selectDistinct, query.selectSeries]); /** * If tried to save a query, enforce the field length limit for the @@ -314,7 +314,7 @@ function Wrapped({ if (!showSeries) setQuery({ ...query, - smushed: false, + selectSeries: false, }); }, [showSeries]); @@ -578,7 +578,7 @@ function Wrapped({ /> setQuery({ ...query, - smushed: !(query.smushed ?? false), + selectSeries: !(query.selectSeries ?? false), }) } /> diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/index.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/index.tsx index 6d354eb5c35..b9ef427a5ef 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryBuilder/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryBuilder/index.tsx @@ -97,7 +97,7 @@ export function createQuery( query.set('contextName', table.name); query.set('contextTableId', table.tableId); query.set('selectDistinct', false); - query.set('smushed', false); + query.set('selectSeries', false); query.set('countOnly', false); query.set('formatAuditRecIds', false); query.set('specifyUser', userInformation.resource_uri); diff --git a/specifyweb/frontend/js_src/lib/components/QueryComboBox/helpers.ts b/specifyweb/frontend/js_src/lib/components/QueryComboBox/helpers.ts index d340b7868fa..ea7020aecec 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryComboBox/helpers.ts +++ b/specifyweb/frontend/js_src/lib/components/QueryComboBox/helpers.ts @@ -35,7 +35,7 @@ export function makeComboBoxQuery({ query.set('contextName', table.name); query.set('contextTableId', table.tableId); query.set('selectDistinct', false); - query.set('smushed', false); + query.set('selectSeries', false); query.set('countOnly', false); query.set('specifyUser', userInformation.resource_uri); query.set('isFavorite', false); diff --git a/specifyweb/frontend/js_src/lib/tests/ajax/static/context/datamodel.json b/specifyweb/frontend/js_src/lib/tests/ajax/static/context/datamodel.json index 8e21e566b4c..c1b9b974212 100644 --- a/specifyweb/frontend/js_src/lib/tests/ajax/static/context/datamodel.json +++ b/specifyweb/frontend/js_src/lib/tests/ajax/static/context/datamodel.json @@ -31079,16 +31079,8 @@ "type": "java.lang.Boolean" }, { - "name": "smushed", - "column": "smushed", - "indexed": false, - "unique": false, - "required": false, - "type": "java.lang.Boolean" - }, - { - "name": "smushed", - "column": "Smushed", + "name": "selectSeries", + "column": "selectSeries", "indexed": false, "unique": false, "required": false, diff --git a/specifyweb/specify/datamodel.py b/specifyweb/specify/datamodel.py index c499909192e..1dbdb9e20ee 100644 --- a/specifyweb/specify/datamodel.py +++ b/specifyweb/specify/datamodel.py @@ -6595,7 +6595,7 @@ def is_tree_table(table: Table): Field(name='remarks', column='Remarks', indexed=False, unique=False, required=False, type='text', length=4096), Field(name='searchSynonymy', column='SearchSynonymy', indexed=False, unique=False, required=False, type='java.lang.Boolean'), Field(name='selectDistinct', column='SelectDistinct', indexed=False, unique=False, required=False, type='java.lang.Boolean'), - Field(name='smushed', column='Smushed', indexed=False, unique=False, required=False, type='java.lang.Boolean'), + Field(name='selectseries', column='SelectSeries', indexed=False, unique=False, required=False, type='java.lang.Boolean'), Field(name='sqlStr', column='SqlStr', indexed=False, unique=False, required=False, type='text', length=4096), Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'), Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'), diff --git a/specifyweb/specify/migrations/0033_change_smushed_to_selectseries.py b/specifyweb/specify/migrations/0033_change_smushed_to_selectseries.py new file mode 100644 index 00000000000..fcd43bc5f8b --- /dev/null +++ b/specifyweb/specify/migrations/0033_change_smushed_to_selectseries.py @@ -0,0 +1,18 @@ +from django.db import migrations + +class Migration(migrations.Migration): + + dependencies = [ + ('specify', '0032_remove_spquery_selectseries'), + ] + + operations = [ + migrations.RunSQL( + sql=""" + ALTER TABLE spquery CHANGE COLUMN Smushed SelectSeries BIT(1); + """, + reverse_sql=""" + ALTER TABLE spquery CHANGE COLUMN SelectSeries Smushed BIT(1); + """ + ), + ] \ No newline at end of file diff --git a/specifyweb/specify/models.py b/specifyweb/specify/models.py index 80318f7278f..a83ec899364 100644 --- a/specifyweb/specify/models.py +++ b/specifyweb/specify/models.py @@ -6261,7 +6261,7 @@ class Spquery(models.Model): remarks = models.TextField(blank=True, null=True, unique=False, db_column='Remarks', db_index=False) searchsynonymy = models.BooleanField(blank=True, null=True, unique=False, db_column='SearchSynonymy', db_index=False) selectdistinct = models.BooleanField(blank=True, null=True, unique=False, db_column='SelectDistinct', db_index=False) - smushed = models.BooleanField(blank=True, null=True, unique=False, db_column='Smushed', db_index=False) + selectseries = models.BooleanField(blank=True, null=True, unique=False, db_column='SelectSeries', db_index=False) sqlstr = models.TextField(blank=True, null=True, unique=False, db_column='SqlStr', db_index=False) timestampcreated = models.DateTimeField(blank=False, null=False, unique=False, db_column='TimestampCreated', db_index=False, default=timezone.now) timestampmodified = models.DateTimeField(blank=True, null=True, unique=False, db_column='TimestampModified', db_index=False, default=timezone.now) # auto_now=True diff --git a/specifyweb/specify/tests/test_geotime.py b/specifyweb/specify/tests/test_geotime.py index 36f73b57340..3e46585097c 100644 --- a/specifyweb/specify/tests/test_geotime.py +++ b/specifyweb/specify/tests/test_geotime.py @@ -496,7 +496,7 @@ def test_geotime_any(self): "_tablename": "SpQuery", "remarks": None, "searchsynonymy": None, - "smushed": None, + "selectseries": False, "sqlstr": None, "timestampcreated": "2024-11-06", "timestampmodified": None, diff --git a/specifyweb/stored_queries/execution.py b/specifyweb/stored_queries/execution.py index 55e8dc8eea5..d78ff592c1b 100644 --- a/specifyweb/stored_queries/execution.py +++ b/specifyweb/stored_queries/execution.py @@ -575,7 +575,7 @@ def run_ephemeral_query(collection, user, spquery): offset = spquery.get("offset", 0) recordsetid = spquery.get("recordsetid", None) distinct = spquery["selectdistinct"] - series = spquery.get("smushed", False) + series = spquery.get("selectseries", False) tableid = spquery["contexttableid"] count_only = spquery["countonly"] format_audits = spquery.get("formatauditrecids", False) diff --git a/specifyweb/stored_queries/tests/static/co_query.json b/specifyweb/stored_queries/tests/static/co_query.json index 27df5681f38..36a2199a68e 100644 --- a/specifyweb/stored_queries/tests/static/co_query.json +++ b/specifyweb/stored_queries/tests/static/co_query.json @@ -3,7 +3,7 @@ "contextname": "CollectionObject", "contexttableid": 1, "selectdistinct": false, - "smushed": false, + "selectseries": false, "countonly": true, "formatauditrecids": false, "specifyuser": "/api/specify/specifyuser/1/", @@ -410,7 +410,6 @@ "_tablename": "SpQuery", "remarks": null, "searchsynonymy": null, - "smushed": null, "sqlstr": null, "timestampcreated": "2024-08-20", "timestampmodified": null, diff --git a/specifyweb/stored_queries/views.py b/specifyweb/stored_queries/views.py index ab47909f64e..377b0940aa7 100644 --- a/specifyweb/stored_queries/views.py +++ b/specifyweb/stored_queries/views.py @@ -83,7 +83,7 @@ def query(request, id): with models.session_context() as session: sp_query = session.query(models.SpQuery).get(int(id)) distinct = sp_query.selectDistinct - series = sp_query.smushed + series = sp_query.selectSeries tableid = sp_query.contextTableId count_only = sp_query.countOnly