Merge branch 'develop' into 587-remove-frozen

ONSdigital · Jan 9, 2024 · dab8763 · dab8763
2 parents e793fc1 + 4b13e3a
commit dab8763
Show file tree

Hide file tree

Showing 50 changed files with 2,758 additions and 767 deletions.
diff --git a/config/cellno_2022_schema.toml b/config/cellno_2022_schema.toml
@@ -0,0 +1,11 @@
+[cell_no]
+Deduced_Data_Type = "Int64"
+
+[UNI_Count]
+Deduced_Data_Type = "Int64"
+
+[uni_employment]
+Deduced_Data_Type = "Int64"
+
+[uni_turnover]
+Deduced_Data_Type = "Int64"
diff --git a/config/civil_defence_detailed_schema.toml b/config/civil_defence_detailed_schema.toml
@@ -0,0 +1,11 @@
+[A]
+Deduced_Data_Type = "str"
+
+[B]
+Deduced_Data_Type = "str"
+
+[C]
+Deduced_Data_Type = "str"
+
+[CD]
+Deduced_Data_Type = "str"
diff --git a/config/construction_ni_schema.toml b/config/construction_ni_schema.toml
@@ -10,6 +10,10 @@ Deduced_Data_Type = "Int64"
 old_name = "current_sic"
 Deduced_Data_Type = "Int64"
 
+[legalstatus]
+old_name = "legal status"
+Deduced_Data_Type = "Int64"
+
 [referencename]
 old_name = "company name"
 Deduced_Data_Type = "object"
@@ -26,6 +30,10 @@ Deduced_Data_Type = "Int64"
 old_name = "ru_turnover"
 Deduced_Data_Type = "Int64"
 
+[enterprisereference]
+old_name = "entref"
+Deduced_Data_Type = "object"
+
 [wowenterprisereference]
 old_name = "wowref"
 Deduced_Data_Type = "object"
@@ -34,6 +42,10 @@ Deduced_Data_Type = "object"
 old_name = "ult FOC"
 Deduced_Data_Type = "object"
 
+[instance]
+old_name = "instance"
+Deduced_Data_Type = "Int64"
+
 [200]
 old_name = "q200"
 Deduced_Data_Type = "str"
@@ -62,8 +74,8 @@ Deduced_Data_Type = "float64"
 old_name = "q206"
 Deduced_Data_Type = "float64"
 
-[207 ]
-old_name = "q207 "
+[207]
+old_name = "q207"
 Deduced_Data_Type = "float64"
 
 [209]

diff --git a/config/construction_schema.toml b/config/construction_schema.toml
@@ -60,7 +60,7 @@ Possible_Categorical_Values = [100, 200, 201, 210, 211, 301, 302, 303, 304, 305,
 
 [receiptdate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = ["None","str"]
 Length = "nan"
@@ -360,7 +360,7 @@ Possible_Categorical_Values = ["WW", "BB", "FE", "GG", "JG", "HH", "ED", "KJ", "
 
 [birthdate]
 Description = "Datetime format = format=%d/%m/%Y"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = "str"
 Length = "nan"
@@ -420,7 +420,7 @@ Possible_categorical_Values = ["nan"]
 
 [lastupdateddate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = ["None","str"]
 Length = "nan"

diff --git a/config/contributors_schema.toml b/config/contributors_schema.toml
@@ -50,7 +50,7 @@ Possible_Categorical_Values = ["Clear", "Clear - overridden", "Form saved", "Cle
 
 [statusencoded]
 Description = "nan"
-Deduced_Data_Type = "category"
+Deduced_Data_Type = "Int64"
 Nullable = false
 Current_Data_Type = "Int64"
 Length = 3
@@ -60,7 +60,7 @@ Possible_Categorical_Values = [100, 200, 201, 210, 211, 301, 302, 303, 304, 305,
 
 [receiptdate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = ["None","str"]
 Length = "nan"
@@ -360,7 +360,7 @@ Possible_Categorical_Values = ["WW", "BB", "FE", "GG", "JG", "HH", "ED", "KJ", "
 
 [birthdate]
 Description = "Datetime format = format=%d/%m/%Y"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = "str"
 Length = "nan"
@@ -430,7 +430,7 @@ Possible_Categorical_Values = ["ingestion"]
 
 [createddate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = "str"
 Length = ">=1"
@@ -450,7 +450,7 @@ Possible_Categorical_Values = ["data_migration", "Cheri", "Adela", "David"]
 
 [lastupdateddate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = ["None","str"]
 Length = "nan"

diff --git a/config/cora_schema.toml b/config/cora_schema.toml
diff --git a/config/long_response.toml b/config/long_response.toml
@@ -80,7 +80,7 @@ Possible_Categorical_Values = ["ingestion"]
 
 [createddate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = "str"
 Length = ">=1"
@@ -100,7 +100,7 @@ Possible_Categorical_Values = ["data_migration", "Cheri", "Adela", "David"]
 
 [lastupdateddate]
 Description = "Datetime format = %Y-%m-%d %H:%M:%S.%f+00"
-Deduced_Data_Type = "datetime64"
+Deduced_Data_Type = "datetime64ns"
 Nullable = false
 Current_Data_Type = ["None","str"]
 Length = "nan"

diff --git a/config/manual_trimming_schema.toml → config/manual_trim_schema.toml b/config/manual_trimming_schema.toml → config/manual_trim_schema.toml
@@ -19,7 +19,7 @@ Max_values = "nan"
 Possible_Categorical_Values = ["nan"]
 
 
-[manual_trimming]
+[manual_trim]
 Description = "nan"
 Deduced_Data_Type = "boolean"
 Nullable = false

diff --git a/config/ni_responses_schema.toml → config/ni_full_responses.toml b/config/ni_responses_schema.toml → config/ni_full_responses.toml
@@ -10,6 +10,42 @@ Deduced_Data_Type = "Int64"
 old_name = "current_sic"
 Deduced_Data_Type = "Int64"
 
+[legalstatus]
+old_name = "legal status"
+Deduced_Data_Type = "Int64"
+
+[referencename]
+old_name = "company name"
+Deduced_Data_Type = "object"
+
+[referencepostcode]
+old_name = "company postcode"
+Deduced_Data_Type = "object"
+
+[employment]
+old_name = "ru_emp"
+Deduced_Data_Type = "Int64"
+
+[turnover]
+old_name = "ru_turnover"
+Deduced_Data_Type = "Int64"
+
+[enterprisereference]
+old_name = "entref"
+Deduced_Data_Type = "object"
+
+[wowenterprisereference]
+old_name = "wowref"
+Deduced_Data_Type = "object"
+
+[foc]
+old_name = "ult FOC"
+Deduced_Data_Type = "object"
+
+[instance]
+old_name = "instance"
+Deduced_Data_Type = "Int64"
+
 [200]
 old_name = "q200"
 Deduced_Data_Type = "str"
@@ -38,8 +74,8 @@ Deduced_Data_Type = "float64"
 old_name = "q206"
 Deduced_Data_Type = "float64"
 
-[207 ]
-old_name = "q207 "
+[207]
+old_name = "q207"
 Deduced_Data_Type = "float64"
 
 [209]

diff --git a/config/ni_indicative_schema.toml b/config/ni_indicative_schema.toml