From 81a6b211e68a25184c9c9db79e3919d7d6ed74f0 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Mon, 13 Jan 2020 18:30:37 +0100
Subject: [PATCH 01/10] Use GDA2020 source data

---
 gnaf-db/src/main/script/createGnafDb.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index 2a3809a..8f87faf 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -11,8 +11,8 @@ mkdir -p $dataDir
 jsonUrl=http://www.data.gov.au/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc
 # get data URL for current version from JSON
 curl -sL $jsonUrl > meta.json
-dataUrl=$( jq -r '.result.resources[] | select(.format == "ZIP") | .url' meta.json )
-last_modified=$( jq -r '.result.resources[] | select(.format == "ZIP") | .last_modified' meta.json )
+dataUrl=$( jq -r '.result.resources[] | select((.format == "ZIP") and (.name | test("GDA2020"))) | .url' meta.json )
+last_modified=$( jq -r '.result.resources[] | select((.format == "ZIP") and (.name | test("GDA2020"))) | .last_modified' meta.json )
 
 # download ZIP data file unless already done
 zip=$dataDir/${dataUrl##*/}

From 5a81526848bd53f73366aa74cc8cb340b60cebb4 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Tue, 23 Jun 2020 19:12:20 +0200
Subject: [PATCH 02/10] default to GDA2020 projection

---
 gnaf-db/src/main/script/createGnafDb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index 8f87faf..561c9ab 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -16,7 +16,7 @@ last_modified=$( jq -r '.result.resources[] | select((.format == "ZIP") and (.na
 
 # download ZIP data file unless already done
 zip=$dataDir/${dataUrl##*/}
-[[ -f "$zip" ]] || ( cd $dataDir; wget "$dataUrl" )
+[[ -f "$zip" ]] || ( cd $dataDir; wget --no-clobber "$dataUrl" )
 
 unzipped=$dataDir/unzipped
 # get dir path where the zip file's */Extras/ will be extracted (contains release month so releases don't clobber each other)

From d073dd0fd28c0396496c9fb2d5c2e6c7cb2bd4d3 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Wed, 19 Aug 2020 15:24:13 +0200
Subject: [PATCH 03/10] createGnafDb: the directory structure in zip file seems
 to have changed

---
 gnaf-db/src/main/script/createGnafDb.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index 561c9ab..d7030bc 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -22,11 +22,17 @@ unzipped=$dataDir/unzipped
 # get dir path where the zip file's */Extras/ will be extracted (contains release month so releases don't clobber each other)
 # get path from zip, discard leading info up to time and following spaces, keep the rest apart from the trailing /
 # maybe a bit too brittle?
-gnafExtras="$unzipped/$( unzip -l "$zip" '*/Extras/' | sed -rn '/Extras/s~^.*[0-9][0-9]:[0-9][0-9] *(.*)/$~\1~p' )"
-# unzip unless $gnafExtras already exists 
+# 'unzip -l' prints 
+#      8868  2020-08-16 22:14   G-NAF/Extras/GNAF_TableCreation_Scripts/create_tables_sqlserver.sql
+# and we extract 'G-NAF'
+gnafExtras="$unzipped/$( unzip -l "$zip" '*/Extras/*' | sed -rn 's~^.*[0-9][0-9]:[0-9][0-9] *(.*/Extras)/.+$~\1~p' | head -1 )"
+# unzip unless $gnafExtras already exists
 [[ -d "$gnafExtras" ]] || ( mkdir -p $unzipped; cd $unzipped; unzip $zip )
 # get dir path parent of Standard/
-gnafData="$unzipped/$( unzip -l "$zip" '*/Standard/' | sed -rn '/Standard/s~^.*[0-9][0-9]:[0-9][0-9] *(.*)/Standard/$~\1~p' )"
+# 'unzip -l' prints 
+#   3357974  2020-08-16 22:22   G-NAF/G-NAF AUGUST 2020/Standard/WA_ADDRESS_ALIAS_psv.psv
+# and we extract 'G-NAF/G-NAF AUGUST 2020'
+gnafData="$unzipped/$( unzip -l "$zip" '*/Standard/*' | sed -rn 's~^.*[0-9][0-9]:[0-9][0-9] *(.*)/Standard/.+~\1~p' | head -1 )"
 
 mkdir -p target/generated
 cat > target/generated/version.json <<EoF

From fdb05185082f379be2368736b759cfdd7e0c37e7 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Wed, 26 May 2021 20:42:18 +0200
Subject: [PATCH 04/10] 2021-May data is missing table creation scripts, add
 2021-Feb scripts to repo

---
 .../GNAF_TableCreation_Scripts/README.txt     |   5 +
 .../add_fk_constraints.sql                    | 303 ++++++++++++++++
 .../create_tables_ansi.sql                    | 332 ++++++++++++++++++
 .../create_tables_sqlserver.sql               | 331 +++++++++++++++++
 .../GNAF_View_Scripts/README.txt              |   3 +
 .../GNAF_View_Scripts/address_view.sql        |  74 ++++
 gnaf-db/src/main/script/createGnafDb.sh       |   5 +
 7 files changed, 1053 insertions(+)
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/README.txt
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/add_fk_constraints.sql
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_ansi.sql
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_sqlserver.sql
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/README.txt
 create mode 100644 FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/address_view.sql

diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/README.txt b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/README.txt
new file mode 100644
index 0000000..8113a35
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/README.txt
@@ -0,0 +1,5 @@
+G-NAF Table Creation Scripts README
+-----------------------------------
+
+These SQL scripts are provided as an example for the purposes of G-NAF table creation. They may require editing before using for other purposes.
+The schema definitions were valid at the G-NAF AUGUST 2018 release state.
\ No newline at end of file
diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/add_fk_constraints.sql b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/add_fk_constraints.sql
new file mode 100644
index 0000000..8ce3f88
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/add_fk_constraints.sql
@@ -0,0 +1,303 @@
+--  
+-- SQL script to Add primary and foreign key constraints
+--   
+-- Automatically generated by Lynx on 2018.07.27 AD at 11:27:05 EST   
+--   
+--   
+
+-- ********************************************************************************************
+-- ********************************************************************************************
+-- Create primary key table constraints 
+-- ********************************************************************************************
+-- ********************************************************************************************
+
+ALTER TABLE ADDRESS_ALIAS ADD
+ CONSTRAINT ADDRESS_ALIAS_PK PRIMARY KEY (address_alias_pid);
+
+ALTER TABLE ADDRESS_ALIAS_TYPE_AUT ADD
+ CONSTRAINT ADDRESS_ALIAS_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE ADDRESS_CHANGE_TYPE_AUT ADD
+ CONSTRAINT ADDRESS_CHANGE_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE ADDRESS_DEFAULT_GEOCODE ADD
+ CONSTRAINT ADDRESS_DEFAULT_GEOCODE_PK PRIMARY KEY (address_default_geocode_pid);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_PK PRIMARY KEY (address_detail_pid);
+
+ALTER TABLE ADDRESS_FEATURE ADD
+ CONSTRAINT ADDRESS_FEATURE_PK PRIMARY KEY (address_feature_id);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2011 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2011_PK PRIMARY KEY (address_mesh_block_2011_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2016 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2016_PK PRIMARY KEY (address_mesh_block_2016_pid);
+
+ALTER TABLE ADDRESS_SITE ADD
+ CONSTRAINT ADDRESS_SITE_PK PRIMARY KEY (address_site_pid);
+
+ALTER TABLE ADDRESS_SITE_GEOCODE ADD
+ CONSTRAINT ADDRESS_SITE_GEOCODE_PK PRIMARY KEY (address_site_geocode_pid);
+
+ALTER TABLE ADDRESS_TYPE_AUT ADD
+ CONSTRAINT ADDRESS_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE FLAT_TYPE_AUT ADD
+ CONSTRAINT FLAT_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE GEOCODED_LEVEL_TYPE_AUT ADD
+ CONSTRAINT GEOCODED_LEVEL_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE GEOCODE_RELIABILITY_AUT ADD
+ CONSTRAINT GEOCODE_RELIABILITY_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE GEOCODE_TYPE_AUT ADD
+ CONSTRAINT GEOCODE_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE LEVEL_TYPE_AUT ADD
+ CONSTRAINT LEVEL_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE LOCALITY ADD
+ CONSTRAINT LOCALITY_PK PRIMARY KEY (locality_pid);
+
+ALTER TABLE LOCALITY_ALIAS ADD
+ CONSTRAINT LOCALITY_ALIAS_PK PRIMARY KEY (locality_alias_pid);
+
+ALTER TABLE LOCALITY_ALIAS_TYPE_AUT ADD
+ CONSTRAINT LOCALITY_ALIAS_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE LOCALITY_CLASS_AUT ADD
+ CONSTRAINT LOCALITY_CLASS_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE LOCALITY_NEIGHBOUR ADD
+ CONSTRAINT LOCALITY_NEIGHBOUR_PK PRIMARY KEY (locality_neighbour_pid);
+
+ALTER TABLE LOCALITY_POINT ADD
+ CONSTRAINT LOCALITY_POINT_PK PRIMARY KEY (locality_point_pid);
+
+ALTER TABLE MB_2011 ADD
+ CONSTRAINT MB_2011_PK PRIMARY KEY (mb_2011_pid);
+
+ALTER TABLE MB_2016 ADD
+ CONSTRAINT MB_2016_PK PRIMARY KEY (mb_2016_pid);
+
+ALTER TABLE MB_MATCH_CODE_AUT ADD
+ CONSTRAINT MB_MATCH_CODE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE PRIMARY_SECONDARY ADD
+ CONSTRAINT PRIMARY_SECONDARY_PK PRIMARY KEY (primary_secondary_pid);
+
+ALTER TABLE PS_JOIN_TYPE_AUT ADD
+ CONSTRAINT PS_JOIN_TYPE_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE STATE ADD
+ CONSTRAINT STATE_PK PRIMARY KEY (state_pid);
+
+ALTER TABLE STREET_CLASS_AUT ADD
+ CONSTRAINT STREET_CLASS_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_PK PRIMARY KEY (street_locality_pid);
+
+ALTER TABLE STREET_LOCALITY_ALIAS ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_PK PRIMARY KEY (street_locality_alias_pid);
+
+ALTER TABLE STREET_LOCALITY_ALIAS_TYPE_AUT ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_TYPE__PK PRIMARY KEY (code);
+
+ALTER TABLE STREET_LOCALITY_POINT ADD
+ CONSTRAINT STREET_LOCALITY_POINT_PK PRIMARY KEY (street_locality_point_pid);
+
+ALTER TABLE STREET_SUFFIX_AUT ADD
+ CONSTRAINT STREET_SUFFIX_AUT_PK PRIMARY KEY (code);
+
+ALTER TABLE STREET_TYPE_AUT ADD
+ CONSTRAINT STREET_TYPE_AUT_PK PRIMARY KEY (code);
+
+-- ********************************************************************************************
+-- ********************************************************************************************
+-- Create foreign key table constraints 
+-- ********************************************************************************************
+-- ********************************************************************************************
+
+ALTER TABLE ADDRESS_ALIAS ADD
+ CONSTRAINT ADDRESS_ALIAS_FK1 FOREIGN KEY (alias_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_ALIAS ADD
+ CONSTRAINT ADDRESS_ALIAS_FK2 FOREIGN KEY (alias_type_code)
+  REFERENCES ADDRESS_ALIAS_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_ALIAS ADD
+ CONSTRAINT ADDRESS_ALIAS_FK3 FOREIGN KEY (principal_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_DEFAULT_GEOCODE ADD
+ CONSTRAINT ADDRESS_DEFAULT_GEOCODE_FK1 FOREIGN KEY (address_detail_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_DEFAULT_GEOCODE ADD
+ CONSTRAINT ADDRESS_DEFAULT_GEOCODE_FK2 FOREIGN KEY (geocode_type_code)
+  REFERENCES GEOCODE_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK1 FOREIGN KEY (address_site_pid)
+  REFERENCES ADDRESS_SITE (address_site_pid);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK2 FOREIGN KEY (flat_type_code)
+  REFERENCES FLAT_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK3 FOREIGN KEY (level_geocoded_code)
+  REFERENCES GEOCODED_LEVEL_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK4 FOREIGN KEY (level_type_code)
+  REFERENCES LEVEL_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK5 FOREIGN KEY (locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE ADDRESS_DETAIL ADD
+ CONSTRAINT ADDRESS_DETAIL_FK6 FOREIGN KEY (street_locality_pid)
+  REFERENCES STREET_LOCALITY (street_locality_pid);
+
+ALTER TABLE ADDRESS_FEATURE ADD
+ CONSTRAINT ADDRESS_FEATURE_FK1 FOREIGN KEY (address_change_type_code)
+  REFERENCES ADDRESS_CHANGE_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_FEATURE ADD
+ CONSTRAINT ADDRESS_FEATURE_FK2 FOREIGN KEY (address_detail_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2011 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2011_FK1 FOREIGN KEY (address_detail_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2011 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2011_FK2 FOREIGN KEY (mb_2011_pid)
+  REFERENCES MB_2011 (mb_2011_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2011 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2011_FK3 FOREIGN KEY (mb_match_code)
+  REFERENCES MB_MATCH_CODE_AUT (code);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2016 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2016_FK1 FOREIGN KEY (address_detail_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2016 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2016_FK2 FOREIGN KEY (mb_2016_pid)
+  REFERENCES MB_2016 (mb_2016_pid);
+
+ALTER TABLE ADDRESS_MESH_BLOCK_2016 ADD
+ CONSTRAINT ADDRESS_MESH_BLOCK_2016_FK3 FOREIGN KEY (mb_match_code)
+  REFERENCES MB_MATCH_CODE_AUT (code);
+
+ALTER TABLE ADDRESS_SITE ADD
+ CONSTRAINT ADDRESS_SITE_FK1 FOREIGN KEY (address_type)
+  REFERENCES ADDRESS_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_SITE_GEOCODE ADD
+ CONSTRAINT ADDRESS_SITE_GEOCODE_FK1 FOREIGN KEY (address_site_pid)
+  REFERENCES ADDRESS_SITE (address_site_pid);
+
+ALTER TABLE ADDRESS_SITE_GEOCODE ADD
+ CONSTRAINT ADDRESS_SITE_GEOCODE_FK2 FOREIGN KEY (geocode_type_code)
+  REFERENCES GEOCODE_TYPE_AUT (code);
+
+ALTER TABLE ADDRESS_SITE_GEOCODE ADD
+ CONSTRAINT ADDRESS_SITE_GEOCODE_FK3 FOREIGN KEY (reliability_code)
+  REFERENCES GEOCODE_RELIABILITY_AUT (code);
+
+ALTER TABLE LOCALITY ADD
+ CONSTRAINT LOCALITY_FK1 FOREIGN KEY (gnaf_reliability_code)
+  REFERENCES GEOCODE_RELIABILITY_AUT (code);
+
+ALTER TABLE LOCALITY ADD
+ CONSTRAINT LOCALITY_FK2 FOREIGN KEY (locality_class_code)
+  REFERENCES LOCALITY_CLASS_AUT (code);
+
+ALTER TABLE LOCALITY ADD
+ CONSTRAINT LOCALITY_FK3 FOREIGN KEY (state_pid)
+  REFERENCES STATE (state_pid);
+
+ALTER TABLE LOCALITY_ALIAS ADD
+ CONSTRAINT LOCALITY_ALIAS_FK1 FOREIGN KEY (alias_type_code)
+  REFERENCES LOCALITY_ALIAS_TYPE_AUT (code);
+
+ALTER TABLE LOCALITY_ALIAS ADD
+ CONSTRAINT LOCALITY_ALIAS_FK2 FOREIGN KEY (locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE LOCALITY_NEIGHBOUR ADD
+ CONSTRAINT LOCALITY_NEIGHBOUR_FK1 FOREIGN KEY (locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE LOCALITY_NEIGHBOUR ADD
+ CONSTRAINT LOCALITY_NEIGHBOUR_FK2 FOREIGN KEY (neighbour_locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE LOCALITY_POINT ADD
+ CONSTRAINT LOCALITY_POINT_FK1 FOREIGN KEY (locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE PRIMARY_SECONDARY ADD
+ CONSTRAINT PRIMARY_SECONDARY_FK1 FOREIGN KEY (primary_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE PRIMARY_SECONDARY ADD
+ CONSTRAINT PRIMARY_SECONDARY_FK2 FOREIGN KEY (ps_join_type_code)
+  REFERENCES PS_JOIN_TYPE_AUT (code);
+
+ALTER TABLE PRIMARY_SECONDARY ADD
+ CONSTRAINT PRIMARY_SECONDARY_FK3 FOREIGN KEY (secondary_pid)
+  REFERENCES ADDRESS_DETAIL (address_detail_pid);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_FK1 FOREIGN KEY (gnaf_reliability_code)
+  REFERENCES GEOCODE_RELIABILITY_AUT (code);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_FK2 FOREIGN KEY (locality_pid)
+  REFERENCES LOCALITY (locality_pid);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_FK3 FOREIGN KEY (street_class_code)
+  REFERENCES STREET_CLASS_AUT (code);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_FK4 FOREIGN KEY (street_suffix_code)
+  REFERENCES STREET_SUFFIX_AUT (code);
+
+ALTER TABLE STREET_LOCALITY ADD
+ CONSTRAINT STREET_LOCALITY_FK5 FOREIGN KEY (street_type_code)
+  REFERENCES STREET_TYPE_AUT (code);
+
+ALTER TABLE STREET_LOCALITY_ALIAS ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_FK1 FOREIGN KEY (alias_type_code)
+  REFERENCES STREET_LOCALITY_ALIAS_TYPE_AUT (code);
+
+ALTER TABLE STREET_LOCALITY_ALIAS ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_FK2 FOREIGN KEY (street_locality_pid)
+  REFERENCES STREET_LOCALITY (street_locality_pid);
+
+ALTER TABLE STREET_LOCALITY_ALIAS ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_FK3 FOREIGN KEY (street_suffix_code)
+  REFERENCES STREET_SUFFIX_AUT (code);
+
+ALTER TABLE STREET_LOCALITY_ALIAS ADD
+ CONSTRAINT STREET_LOCALITY_ALIAS_FK4 FOREIGN KEY (street_type_code)
+  REFERENCES STREET_TYPE_AUT (code);
+
+ALTER TABLE STREET_LOCALITY_POINT ADD
+ CONSTRAINT STREET_LOCALITY_POINT_FK1 FOREIGN KEY (street_locality_pid)
+  REFERENCES STREET_LOCALITY (street_locality_pid);
+
+
+
+
diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_ansi.sql b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_ansi.sql
new file mode 100644
index 0000000..6dc7428
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_ansi.sql
@@ -0,0 +1,332 @@
+--  
+-- SQL script to Create the published ANSI compliant G-NAF database tables
+--   
+-- Automatically generated by Lynx on 2018.07.27 AD at 11:26:58 EST   
+--   
+--   
+
+
+
+-- ********************************************************************************************
+-- ********************************************************************************************
+-- Create ANSI tables 
+-- ********************************************************************************************
+-- ********************************************************************************************
+
+CREATE TABLE ADDRESS_ALIAS (
+ address_alias_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ principal_pid varchar(15) NOT NULL,
+ alias_pid varchar(15) NOT NULL,
+ alias_type_code varchar(10) NOT NULL,
+ alias_comment varchar(200)
+);
+
+CREATE TABLE ADDRESS_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE ADDRESS_CHANGE_TYPE_AUT (
+ code varchar(50) NOT NULL,
+ name varchar(100) NOT NULL,
+ description varchar(500)
+);
+
+CREATE TABLE ADDRESS_DEFAULT_GEOCODE (
+ address_default_geocode_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ address_detail_pid varchar(15) NOT NULL,
+ geocode_type_code varchar(4) NOT NULL,
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE ADDRESS_DETAIL (
+ address_detail_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_last_modified date,
+ date_retired date,
+ building_name varchar(200),
+ lot_number_prefix varchar(2),
+ lot_number varchar(5),
+ lot_number_suffix varchar(2),
+ flat_type_code varchar(7),
+ flat_number_prefix varchar(2),
+ flat_number numeric(5),
+ flat_number_suffix varchar(2),
+ level_type_code varchar(4),
+ level_number_prefix varchar(2),
+ level_number numeric(3),
+ level_number_suffix varchar(2),
+ number_first_prefix varchar(3),
+ number_first numeric(6),
+ number_first_suffix varchar(2),
+ number_last_prefix varchar(3),
+ number_last numeric(6),
+ number_last_suffix varchar(2),
+ street_locality_pid varchar(15),
+ location_description varchar(45),
+ locality_pid varchar(15) NOT NULL,
+ alias_principal char(1),
+ postcode varchar(4),
+ private_street varchar(75),
+ legal_parcel_id varchar(20),
+ confidence numeric(1),
+ address_site_pid varchar(15) NOT NULL,
+ level_geocoded_code numeric(2) NOT NULL,
+ property_pid varchar(15),
+ gnaf_property_pid varchar(15),
+ primary_secondary varchar(1)
+);
+
+CREATE TABLE ADDRESS_FEATURE (
+ address_feature_id varchar(16) NOT NULL,
+ address_feature_pid varchar(16) NOT NULL,
+ address_detail_pid varchar(15) NOT NULL,
+ date_address_detail_created date NOT NULL,
+ date_address_detail_retired date,
+ address_change_type_code varchar(50)
+);
+
+CREATE TABLE ADDRESS_MESH_BLOCK_2011 (
+ address_mesh_block_2011_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ address_detail_pid varchar(15) NOT NULL,
+ mb_match_code varchar(15) NOT NULL,
+ mb_2011_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE ADDRESS_MESH_BLOCK_2016 (
+ address_mesh_block_2016_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ address_detail_pid varchar(15) NOT NULL,
+ mb_match_code varchar(15) NOT NULL,
+ mb_2016_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE ADDRESS_SITE (
+ address_site_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ address_type varchar(8),
+ address_site_name varchar(200)
+);
+
+CREATE TABLE ADDRESS_SITE_GEOCODE (
+ address_site_geocode_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ address_site_pid varchar(15),
+ geocode_site_name varchar(200),
+ geocode_site_description varchar(45),
+ geocode_type_code varchar(4),
+ reliability_code numeric(1) NOT NULL,
+ boundary_extent numeric(7),
+ planimetric_accuracy numeric(12),
+ elevation numeric(7),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE ADDRESS_TYPE_AUT (
+ code varchar(8) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE FLAT_TYPE_AUT (
+ code varchar(7) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE GEOCODED_LEVEL_TYPE_AUT (
+ code numeric(2) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(70)
+);
+
+CREATE TABLE GEOCODE_RELIABILITY_AUT (
+ code numeric(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(100)
+);
+
+CREATE TABLE GEOCODE_TYPE_AUT (
+ code varchar(4) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(250)
+);
+
+CREATE TABLE LEVEL_TYPE_AUT (
+ code varchar(4) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE LOCALITY (
+ locality_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ locality_name varchar(100) NOT NULL,
+ primary_postcode varchar(4),
+ locality_class_code char(1) NOT NULL,
+ state_pid varchar(15) NOT NULL,
+ gnaf_locality_pid varchar(15),
+ gnaf_reliability_code numeric(1) NOT NULL
+);
+
+CREATE TABLE LOCALITY_ALIAS (
+ locality_alias_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ locality_pid varchar(15) NOT NULL,
+ name varchar(100) NOT NULL,
+ postcode varchar(4),
+ alias_type_code varchar(10) NOT NULL,
+ state_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE LOCALITY_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(100)
+);
+
+CREATE TABLE LOCALITY_CLASS_AUT (
+ code char(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(200)
+);
+
+CREATE TABLE LOCALITY_NEIGHBOUR (
+ locality_neighbour_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ locality_pid varchar(15) NOT NULL,
+ neighbour_locality_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE LOCALITY_POINT (
+ locality_point_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ locality_pid varchar(15) NOT NULL,
+ planimetric_accuracy numeric(12),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE MB_2011 (
+ mb_2011_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ mb_2011_code varchar(15) NOT NULL
+);
+
+CREATE TABLE MB_2016 (
+ mb_2016_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ mb_2016_code varchar(15) NOT NULL
+);
+
+CREATE TABLE MB_MATCH_CODE_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(100) NOT NULL,
+ description varchar(250)
+);
+
+CREATE TABLE PRIMARY_SECONDARY (
+ primary_secondary_pid varchar(15) NOT NULL,
+ primary_pid varchar(15) NOT NULL,
+ secondary_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ ps_join_type_code numeric(2) NOT NULL,
+ ps_join_comment varchar(500)
+);
+
+CREATE TABLE PS_JOIN_TYPE_AUT (
+ code numeric(2) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(500)
+);
+
+CREATE TABLE STATE (
+ state_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ state_name varchar(50) NOT NULL,
+ state_abbreviation varchar(3) NOT NULL
+);
+
+CREATE TABLE STREET_CLASS_AUT (
+ code char(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(200)
+);
+
+CREATE TABLE STREET_LOCALITY (
+ street_locality_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ street_class_code char(1) NOT NULL,
+ street_name varchar(100) NOT NULL,
+ street_type_code varchar(15),
+ street_suffix_code varchar(15),
+ locality_pid varchar(15) NOT NULL,
+ gnaf_street_pid varchar(15),
+ gnaf_street_confidence numeric(1),
+ gnaf_reliability_code numeric(1) NOT NULL
+);
+
+CREATE TABLE STREET_LOCALITY_ALIAS (
+ street_locality_alias_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ street_locality_pid varchar(15) NOT NULL,
+ street_name varchar(100) NOT NULL,
+ street_type_code varchar(15),
+ street_suffix_code varchar(15),
+ alias_type_code varchar(10) NOT NULL
+);
+
+CREATE TABLE STREET_LOCALITY_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(15)
+);
+
+CREATE TABLE STREET_LOCALITY_POINT (
+ street_locality_point_pid varchar(15) NOT NULL,
+ date_created date NOT NULL,
+ date_retired date,
+ street_locality_pid varchar(15) NOT NULL,
+ boundary_extent numeric(7),
+ planimetric_accuracy numeric(12),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE STREET_SUFFIX_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE STREET_TYPE_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(15)
+);
+
+
+
+
diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_sqlserver.sql b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_sqlserver.sql
new file mode 100644
index 0000000..50b7dd4
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_TableCreation_Scripts/create_tables_sqlserver.sql
@@ -0,0 +1,331 @@
+--  
+-- SQL script to Create the published ANSI compliant G-NAF database tables
+--   
+-- Automatically generated by Lynx on 2018.07.27 AD at 11:27:01 EST   
+--   
+--   
+
+
+-- ********************************************************************************************
+-- ********************************************************************************************
+-- Create ANSI tables 
+-- ********************************************************************************************
+-- ********************************************************************************************
+
+CREATE TABLE ADDRESS_ALIAS (
+ address_alias_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ principal_pid varchar(15) NOT NULL,
+ alias_pid varchar(15) NOT NULL,
+ alias_type_code varchar(10) NOT NULL,
+ alias_comment varchar(200)
+);
+
+CREATE TABLE ADDRESS_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE ADDRESS_CHANGE_TYPE_AUT (
+ code varchar(50) NOT NULL,
+ name varchar(100) NOT NULL,
+ description varchar(500)
+);
+
+CREATE TABLE ADDRESS_DEFAULT_GEOCODE (
+ address_default_geocode_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ address_detail_pid varchar(15) NOT NULL,
+ geocode_type_code varchar(4) NOT NULL,
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE ADDRESS_DETAIL (
+ address_detail_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_last_modified datetime,
+ date_retired datetime,
+ building_name varchar(200),
+ lot_number_prefix varchar(2),
+ lot_number varchar(5),
+ lot_number_suffix varchar(2),
+ flat_type_code varchar(7),
+ flat_number_prefix varchar(2),
+ flat_number numeric(5),
+ flat_number_suffix varchar(2),
+ level_type_code varchar(4),
+ level_number_prefix varchar(2),
+ level_number numeric(3),
+ level_number_suffix varchar(2),
+ number_first_prefix varchar(3),
+ number_first numeric(6),
+ number_first_suffix varchar(2),
+ number_last_prefix varchar(3),
+ number_last numeric(6),
+ number_last_suffix varchar(2),
+ street_locality_pid varchar(15),
+ location_description varchar(45),
+ locality_pid varchar(15) NOT NULL,
+ alias_principal char(1),
+ postcode varchar(4),
+ private_street varchar(75),
+ legal_parcel_id varchar(20),
+ confidence numeric(1),
+ address_site_pid varchar(15) NOT NULL,
+ level_geocoded_code numeric(2) NOT NULL,
+ property_pid varchar(15),
+ gnaf_property_pid varchar(15),
+ primary_secondary varchar(1)
+);
+
+CREATE TABLE ADDRESS_FEATURE (
+ address_feature_id varchar(16) NOT NULL,
+ address_feature_pid varchar(16) NOT NULL,
+ address_detail_pid varchar(15) NOT NULL,
+ date_address_detail_created datetime NOT NULL,
+ date_address_detail_retired datetime,
+ address_change_type_code varchar(50)
+);
+
+CREATE TABLE ADDRESS_MESH_BLOCK_2011 (
+ address_mesh_block_2011_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ address_detail_pid varchar(15) NOT NULL,
+ mb_match_code varchar(15) NOT NULL,
+ mb_2011_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE ADDRESS_MESH_BLOCK_2016 (
+ address_mesh_block_2016_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ address_detail_pid varchar(15) NOT NULL,
+ mb_match_code varchar(15) NOT NULL,
+ mb_2016_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE ADDRESS_SITE (
+ address_site_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ address_type varchar(8),
+ address_site_name varchar(200)
+);
+
+CREATE TABLE ADDRESS_SITE_GEOCODE (
+ address_site_geocode_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ address_site_pid varchar(15),
+ geocode_site_name varchar(200),
+ geocode_site_description varchar(45),
+ geocode_type_code varchar(4),
+ reliability_code numeric(1) NOT NULL,
+ boundary_extent numeric(7),
+ planimetric_accuracy numeric(12),
+ elevation numeric(7),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE ADDRESS_TYPE_AUT (
+ code varchar(8) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE FLAT_TYPE_AUT (
+ code varchar(7) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE GEOCODED_LEVEL_TYPE_AUT (
+ code numeric(2) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(70)
+);
+
+CREATE TABLE GEOCODE_RELIABILITY_AUT (
+ code numeric(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(100)
+);
+
+CREATE TABLE GEOCODE_TYPE_AUT (
+ code varchar(4) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(250)
+);
+
+CREATE TABLE LEVEL_TYPE_AUT (
+ code varchar(4) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE LOCALITY (
+ locality_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ locality_name varchar(100) NOT NULL,
+ primary_postcode varchar(4),
+ locality_class_code char(1) NOT NULL,
+ state_pid varchar(15) NOT NULL,
+ gnaf_locality_pid varchar(15),
+ gnaf_reliability_code numeric(1) NOT NULL
+);
+
+CREATE TABLE LOCALITY_ALIAS (
+ locality_alias_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ locality_pid varchar(15) NOT NULL,
+ name varchar(100) NOT NULL,
+ postcode varchar(4),
+ alias_type_code varchar(10) NOT NULL,
+ state_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE LOCALITY_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(100)
+);
+
+CREATE TABLE LOCALITY_CLASS_AUT (
+ code char(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(200)
+);
+
+CREATE TABLE LOCALITY_NEIGHBOUR (
+ locality_neighbour_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ locality_pid varchar(15) NOT NULL,
+ neighbour_locality_pid varchar(15) NOT NULL
+);
+
+CREATE TABLE LOCALITY_POINT (
+ locality_point_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ locality_pid varchar(15) NOT NULL,
+ planimetric_accuracy numeric(12),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE MB_2011 (
+ mb_2011_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ mb_2011_code varchar(15) NOT NULL
+);
+
+CREATE TABLE MB_2016 (
+ mb_2016_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ mb_2016_code varchar(15) NOT NULL
+);
+
+CREATE TABLE MB_MATCH_CODE_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(100) NOT NULL,
+ description varchar(250)
+);
+
+CREATE TABLE PRIMARY_SECONDARY (
+ primary_secondary_pid varchar(15) NOT NULL,
+ primary_pid varchar(15) NOT NULL,
+ secondary_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ ps_join_type_code numeric(2) NOT NULL,
+ ps_join_comment varchar(500)
+);
+
+CREATE TABLE PS_JOIN_TYPE_AUT (
+ code numeric(2) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(500)
+);
+
+CREATE TABLE STATE (
+ state_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ state_name varchar(50) NOT NULL,
+ state_abbreviation varchar(3) NOT NULL
+);
+
+CREATE TABLE STREET_CLASS_AUT (
+ code char(1) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(200)
+);
+
+CREATE TABLE STREET_LOCALITY (
+ street_locality_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ street_class_code char(1) NOT NULL,
+ street_name varchar(100) NOT NULL,
+ street_type_code varchar(15),
+ street_suffix_code varchar(15),
+ locality_pid varchar(15) NOT NULL,
+ gnaf_street_pid varchar(15),
+ gnaf_street_confidence numeric(1),
+ gnaf_reliability_code numeric(1) NOT NULL
+);
+
+CREATE TABLE STREET_LOCALITY_ALIAS (
+ street_locality_alias_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ street_locality_pid varchar(15) NOT NULL,
+ street_name varchar(100) NOT NULL,
+ street_type_code varchar(15),
+ street_suffix_code varchar(15),
+ alias_type_code varchar(10) NOT NULL
+);
+
+CREATE TABLE STREET_LOCALITY_ALIAS_TYPE_AUT (
+ code varchar(10) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(15)
+);
+
+CREATE TABLE STREET_LOCALITY_POINT (
+ street_locality_point_pid varchar(15) NOT NULL,
+ date_created datetime NOT NULL,
+ date_retired datetime,
+ street_locality_pid varchar(15) NOT NULL,
+ boundary_extent numeric(7),
+ planimetric_accuracy numeric(12),
+ longitude numeric(11,8),
+ latitude numeric(10,8)
+);
+
+CREATE TABLE STREET_SUFFIX_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(30)
+);
+
+CREATE TABLE STREET_TYPE_AUT (
+ code varchar(15) NOT NULL,
+ name varchar(50) NOT NULL,
+ description varchar(15)
+);
+
+
+
+
diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/README.txt b/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/README.txt
new file mode 100644
index 0000000..bf4df56
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/README.txt
@@ -0,0 +1,3 @@
+G-NAF View Scripts README
+-------------------------
+These SQL scripts are an example to be used as a guide for creating views on the G-NAF data. They may require some modification depending on your particular environment.
\ No newline at end of file
diff --git a/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/address_view.sql b/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/address_view.sql
new file mode 100644
index 0000000..d30b044
--- /dev/null
+++ b/FEB21_GNAF_GDA2020_Extras/GNAF_View_Scripts/address_view.sql
@@ -0,0 +1,74 @@
+CREATE OR REPLACE VIEW ADDRESS_VIEW
+
+AS
+
+SELECT
+AD.ADDRESS_DETAIL_PID as ADDRESS_DETAIL_PID,
+AD.STREET_LOCALITY_PID as STREET_LOCALITY_PID,
+AD.LOCALITY_PID as LOCALITY_PID,
+AD.BUILDING_NAME as BUILDING_NAME,
+
+AD.LOT_NUMBER_PREFIX as LOT_NUMBER_PREFIX,
+AD.LOT_NUMBER as LOT_NUMBER,
+AD.LOT_NUMBER_SUFFIX as LOT_NUMBER_SUFFIX,
+
+FTA.NAME as FLAT_TYPE,
+AD.FLAT_NUMBER_PREFIX as FLAT_NUMBER_PREFIX,
+AD.FLAT_NUMBER as FLAT_NUMBER,
+AD.FLAT_NUMBER_SUFFIX as FLAT_NUMBER_SUFFIX,
+
+LTA.NAME as LEVEL_TYPE,
+AD.LEVEL_NUMBER_PREFIX as LEVEL_NUMBER_PREFIX,
+AD.LEVEL_NUMBER as LEVEL_NUMBER,
+AD.LEVEL_NUMBER_SUFFIX as LEVEL_NUMBER_SUFFIX,
+
+AD.NUMBER_FIRST_PREFIX as NUMBER_FIRST_PREFIX,
+AD.NUMBER_FIRST as NUMBER_FIRST,
+AD.NUMBER_FIRST_SUFFIX as NUMBER_FIRST_SUFFIX,
+AD.NUMBER_LAST_PREFIX as NUMBER_LAST_PREFIX,
+AD.NUMBER_LAST as NUMBER_LAST,
+AD.NUMBER_LAST_SUFFIX as NUMBER_LAST_SUFFIX,
+
+SL.STREET_NAME as STREET_NAME,
+SL.STREET_CLASS_CODE as STREET_CLASS_CODE,
+SCA.NAME as STREET_CLASS_TYPE,
+SL.STREET_TYPE_CODE as STREET_TYPE_CODE,
+SL.STREET_SUFFIX_CODE as STREET_SUFFIX_CODE,
+SSA.NAME as STREET_SUFFIX_TYPE,
+
+L.LOCALITY_NAME as LOCALITY_NAME,
+
+ST.STATE_ABBREVIATION as STATE_ABBREVIATION,
+
+AD.POSTCODE as POSTCODE,
+
+ADG.LATITUDE as LATITUDE,
+ADG.LONGITUDE as LONGITUDE,
+GTA.NAME as GEOCODE_TYPE,
+
+AD.CONFIDENCE as CONFIDENCE,
+
+AD.ALIAS_PRINCIPAL as ALIAS_PRINCIPAL,
+AD.PRIMARY_SECONDARY as PRIMARY_SECONDARY,
+
+AD.LEGAL_PARCEL_ID as LEGAL_PARCEL_ID,
+
+AD.DATE_CREATED as DATE_CREATED
+
+FROM
+
+ADDRESS_DETAIL AD 
+LEFT JOIN FLAT_TYPE_AUT FTA ON AD.FLAT_TYPE_CODE=FTA.CODE
+LEFT JOIN LEVEL_TYPE_AUT LTA ON AD.LEVEL_TYPE_CODE=LTA.CODE
+JOIN STREET_LOCALITY SL ON AD.STREET_LOCALITY_PID=SL.STREET_LOCALITY_PID
+LEFT JOIN STREET_SUFFIX_AUT SSA ON SL.STREET_SUFFIX_CODE=SSA.CODE
+LEFT JOIN STREET_CLASS_AUT SCA ON SL.STREET_CLASS_CODE=SCA.CODE 
+LEFT JOIN STREET_TYPE_AUT STA ON SL.STREET_TYPE_CODE=STA.CODE
+JOIN LOCALITY L ON AD.LOCALITY_PID = L.LOCALITY_PID
+JOIN ADDRESS_DEFAULT_GEOCODE ADG ON AD.ADDRESS_DETAIL_PID=ADG.ADDRESS_DETAIL_PID
+LEFT JOIN GEOCODE_TYPE_AUT GTA ON ADG.GEOCODE_TYPE_CODE=GTA.CODE
+LEFT JOIN GEOCODED_LEVEL_TYPE_AUT GLTA ON AD.LEVEL_GEOCODED_CODE=GLTA.CODE
+JOIN STATE ST ON L.STATE_PID=ST.STATE_PID
+
+WHERE 
+AD.CONFIDENCE > -1
diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index d7030bc..e909371 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -28,6 +28,11 @@ unzipped=$dataDir/unzipped
 gnafExtras="$unzipped/$( unzip -l "$zip" '*/Extras/*' | sed -rn 's~^.*[0-9][0-9]:[0-9][0-9] *(.*/Extras)/.+$~\1~p' | head -1 )"
 # unzip unless $gnafExtras already exists
 [[ -d "$gnafExtras" ]] || ( mkdir -p $unzipped; cd $unzipped; unzip $zip )
+
+# 2021-May: Data no longer containst the Extra scripts. Using local copy ifrom 2021-Feb instead
+gnafExtras="$baseDir/../FEB21_GNAF_GDA2020_Extras"
+
+
 # get dir path parent of Standard/
 # 'unzip -l' prints 
 #   3357974  2020-08-16 22:22   G-NAF/G-NAF AUGUST 2020/Standard/WA_ADDRESS_ALIAS_psv.psv

From a8b1200c743eff32e50847a408815e159974627a Mon Sep 17 00:00:00 2001
From: Arnaud Ferrand <arferrand@gmail.com>
Date: Tue, 21 Sep 2021 20:31:23 +0100
Subject: [PATCH 05/10] fix sbt installation

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e57d69a..8ba15e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,14 @@ WORKDIR /
 
 RUN apt-get update
 
-RUN apt-get -y install apt-transport-https
+RUN apt-get -y install apt-transport-https curl
+
+# https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions
+RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
+RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
+RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
 
-RUN echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main"
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
 
 RUN apt-get update
 

From 5e5eddbe7777e0f847b9601aa399e5d1c24a5836 Mon Sep 17 00:00:00 2001
From: Marc Tobias <mtmail@gmx.net>
Date: Mon, 23 May 2022 18:37:13 +0200
Subject: [PATCH 06/10] ubuntu 16->20

---
 Dockerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ba15e0..33933f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,18 @@
 # Build
-FROM ubuntu:16.04 as builder
+FROM ubuntu:20.04 as builder
 
-WORKDIR /
+ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update
+WORKDIR /
 
-RUN apt-get -y install apt-transport-https curl
+RUN apt-get update -qq && apt-get -y install apt-transport-https ca-certificates curl gnupg
 
 # https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions
 RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
 RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
 RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
 
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main"
-
-RUN apt-get update
-
-RUN apt-get -y install openjdk-8-jre sbt jq postgresql-client-9.5 wget curl zip time
+RUN apt-get update -qq && apt-get -y install openjdk-8-jre sbt jq postgresql-client wget zip time
 
 ADD . /
 

From 7792665097413151339d250dd48dc54938629c37 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Mon, 20 Nov 2023 14:15:21 +0100
Subject: [PATCH 07/10] Two feeds might be .active, select the first

---
 gnaf-db/src/main/script/createGnafDb.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index e909371..57b109b 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -11,8 +11,10 @@ mkdir -p $dataDir
 jsonUrl=http://www.data.gov.au/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc
 # get data URL for current version from JSON
 curl -sL $jsonUrl > meta.json
-dataUrl=$( jq -r '.result.resources[] | select((.format == "ZIP") and (.name | test("GDA2020"))) | .url' meta.json )
-last_modified=$( jq -r '.result.resources[] | select((.format == "ZIP") and (.name | test("GDA2020"))) | .last_modified' meta.json )
+jq -r '.result.resources[] | | select((.size > 1000000000) and (.state == "active") and (.name | test("GDA2020")))' meta.json > filtered_meta.json
+# Select the first
+dataUrl=$( jq --slurp -r '.[0] | .url' filtered_meta.json )
+last_modified=$( jq --slurp -r '.[0] | .last_modified' filtered_meta.json )
 
 # download ZIP data file unless already done
 zip=$dataDir/${dataUrl##*/}

From 14463dd2c9ba2c78ab2a4a2e058e0ebd48591eba Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Mon, 20 Nov 2023 14:21:32 +0100
Subject: [PATCH 08/10] Two feeds might be .active, select the first

---
 gnaf-db/src/main/script/createGnafDb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index 57b109b..9754fcb 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -11,7 +11,7 @@ mkdir -p $dataDir
 jsonUrl=http://www.data.gov.au/api/3/action/package_show?id=19432f89-dc3a-4ef3-b943-5326ef1dbecc
 # get data URL for current version from JSON
 curl -sL $jsonUrl > meta.json
-jq -r '.result.resources[] | | select((.size > 1000000000) and (.state == "active") and (.name | test("GDA2020")))' meta.json > filtered_meta.json
+jq -r '.result.resources[] | select((.size > 1000000000) and (.state == "active") and (.name | test("GDA2020")))' meta.json > filtered_meta.json
 # Select the first
 dataUrl=$( jq --slurp -r '.[0] | .url' filtered_meta.json )
 last_modified=$( jq --slurp -r '.[0] | .last_modified' filtered_meta.json )

From 60634e908bdd9da2940dd354d3f20235376c6b09 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Mon, 19 May 2025 23:28:36 +0200
Subject: [PATCH 09/10] make downloading more quiet

---
 Dockerfile                              | 4 ++--
 gnaf-db/src/main/script/createGnafDb.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 33933f9..c457018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,14 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /
 
-RUN apt-get update -qq && apt-get -y install apt-transport-https ca-certificates curl gnupg
+RUN apt-get update -qq && apt-get -y -qq install apt-transport-https ca-certificates curl gnupg
 
 # https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions
 RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
 RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
 RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
 
-RUN apt-get update -qq && apt-get -y install openjdk-8-jre sbt jq postgresql-client wget zip time
+RUN apt-get update -qq && apt-get -y -qq install openjdk-8-jre sbt jq postgresql-client wget zip time
 
 ADD . /
 
diff --git a/gnaf-db/src/main/script/createGnafDb.sh b/gnaf-db/src/main/script/createGnafDb.sh
index 9754fcb..6649494 100755
--- a/gnaf-db/src/main/script/createGnafDb.sh
+++ b/gnaf-db/src/main/script/createGnafDb.sh
@@ -18,7 +18,7 @@ last_modified=$( jq --slurp -r '.[0] | .last_modified' filtered_meta.json )
 
 # download ZIP data file unless already done
 zip=$dataDir/${dataUrl##*/}
-[[ -f "$zip" ]] || ( cd $dataDir; wget --no-clobber "$dataUrl" )
+[[ -f "$zip" ]] || ( cd $dataDir; wget --no-clobber --no-verbose "$dataUrl" )
 
 unzipped=$dataDir/unzipped
 # get dir path where the zip file's */Extras/ will be extracted (contains release month so releases don't clobber each other)
@@ -29,7 +29,7 @@ unzipped=$dataDir/unzipped
 # and we extract 'G-NAF'
 gnafExtras="$unzipped/$( unzip -l "$zip" '*/Extras/*' | sed -rn 's~^.*[0-9][0-9]:[0-9][0-9] *(.*/Extras)/.+$~\1~p' | head -1 )"
 # unzip unless $gnafExtras already exists
-[[ -d "$gnafExtras" ]] || ( mkdir -p $unzipped; cd $unzipped; unzip $zip )
+[[ -d "$gnafExtras" ]] || ( mkdir -p $unzipped; cd $unzipped; unzip -q $zip )
 
 # 2021-May: Data no longer containst the Extra scripts. Using local copy ifrom 2021-Feb instead
 gnafExtras="$baseDir/../FEB21_GNAF_GDA2020_Extras"

From e07d23fcd65393a3c46a5f6bdee4a039c7ac66e3 Mon Sep 17 00:00:00 2001
From: Arnaud Ferrand <arferrand@gmail.com>
Date: Mon, 17 Nov 2025 16:17:01 +0000
Subject: [PATCH 10/10] uses ubuntu 24 and openjdk:8u111

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c457018..6913e58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build
-FROM ubuntu:20.04 as builder
+FROM ubuntu:24.04 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -19,7 +19,7 @@ ADD . /
 RUN /bin/bash src/main/script/run.sh
 
 # Run
-FROM openjdk:8-jre
+FROM openjdk:8u111-jre
 
 WORKDIR /