From: Maxious Date: Fri, 23 Dec 2011 00:23:24 +0000 Subject: Migrate agencies to 2 tables X-Git-Url: https://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=c3370a6d6f329795a5c095574962d8faa08b1504 --- Migrate agencies to 2 tables --- --- a/exportData.csv.php +++ b/exportData.csv.php @@ -12,14 +12,14 @@ } $query = $conn->prepare(' -SELECT "CNID",contractnotice."agencyName",agency.abn as "agencyABN", +SELECT "CNID",contractnotice."agencyName",agency_nametoabn.abn as "agencyABN", EXTRACT(EPOCH FROM "publishDate") as "publishDate", EXTRACT(EPOCH FROM "contractStart") as "contractStart", EXTRACT(EPOCH FROM "contractEnd") as "contractEnd", value,description,category, "supplierName",(case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID, (\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as sourceURL -FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName" +FROM contractnotice join agency_nametoabn on contractnotice."agencyName"=agency_nametoabn."agencyName" where "childCN" is null' , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT)); $query->execute();