Merge pull request #5 from opensafely/iaindillingham/bump-to-ehrql-v1

Bump to ehrQL v1

.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
     // "forwardPorts": [],
     // Use 'onCreateCommand' to run commands after the container is started for the first time.
-    "onCreateCommand": "pip3 install --user -r .devcontainer/requirements.in && opensafely exec ehrql:v0 dump-example-data",
+    "onCreateCommand": "pip3 install --user -r .devcontainer/requirements.in && opensafely exec ehrql:v1 dump-example-data",
     // Configure tool-specific properties.
     "customizations": {
         "vscode": {

dataset_definition.py

@@ -1,9 +1,9 @@
 from ehrql import case, codelist_from_csv, create_dataset, days, when
-from ehrql.tables.beta.core import medications, patients
-from ehrql.tables.beta.tpp import (
+from ehrql.tables.core import medications, patients
+from ehrql.tables.tpp import (
     addresses,
+    apcs,
     clinical_events,
-    hospital_admissions,
     practice_registrations,
 )
 
@@ -76,8 +76,8 @@
 # outcome variable
 
 dataset.date_first_admitted = (
-    hospital_admissions.where(hospital_admissions.admission_date.is_after(index_date))
-    .sort_by(hospital_admissions.admission_date)
+    apcs.where(apcs.admission_date.is_after(index_date))
+    .sort_by(apcs.admission_date)
     .first_for_patient()
     .admission_date
 )

project.yaml

@@ -5,7 +5,7 @@ expectations:
 
 actions:
   generate_dataset:
-    run: ehrql:v0 generate-dataset --output dataset.csv.gz dataset_definition.py
+    run: ehrql:v1 generate-dataset --output dataset.csv.gz dataset_definition.py
     outputs:
       highly_sensitive:
         dataset: dataset.csv.gz