From 253b8be449f17fba40624b16c73c57ffbe3552de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Sun, 23 Apr 2017 13:50:49 +0200
Subject: [PATCH] mysql: updated test data

---
 docker/blocks/mysql_opendata/Dockerfile     | 4 ++--
 docker/blocks/mysql_opendata/fig            | 2 +-
 docker/blocks/mysql_opendata/import_csv.sql | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker/blocks/mysql_opendata/Dockerfile b/docker/blocks/mysql_opendata/Dockerfile
index ba75ba8e791..22277a0af3e 100644
--- a/docker/blocks/mysql_opendata/Dockerfile
+++ b/docker/blocks/mysql_opendata/Dockerfile
@@ -11,8 +11,8 @@ ENV MYSQL_DATABASE="testdata" \
 RUN apt-get update && apt-get install -y wget && apt-get install unzip
 
 # Fetch NYC Data Set
-RUN wget https://data.cityofnewyork.us/download/fpz8-jqf4/application%2Fzip -O /tmp/data.zip && \
-  unzip -j /tmp/data.zip 311_Service_Requests_from_2011.csv -d /var/lib/mysql-files
+RUN wget https://data.cityofnewyork.us/download/57g5-etyj/application%2Fzip -O /tmp/data.zip && \
+  unzip -j /tmp/data.zip 311_Service_Requests_from_2015.csv -d /var/lib/mysql-files
 
 ADD import_csv.sql /docker-entrypoint-initdb.d/
 
diff --git a/docker/blocks/mysql_opendata/fig b/docker/blocks/mysql_opendata/fig
index 9742d5c5f07..a374fbd0931 100644
--- a/docker/blocks/mysql_opendata/fig
+++ b/docker/blocks/mysql_opendata/fig
@@ -6,4 +6,4 @@ mysql_opendata:
     MYSQL_USER: grafana
     MYSQL_PASSWORD: password
   ports:
-    - "3306:3306"
+    - "3307:3306"
diff --git a/docker/blocks/mysql_opendata/import_csv.sql b/docker/blocks/mysql_opendata/import_csv.sql
index 749f71fae42..97ac889e8dd 100644
--- a/docker/blocks/mysql_opendata/import_csv.sql
+++ b/docker/blocks/mysql_opendata/import_csv.sql
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `nyc_open_data` (
   Longitude varchar(255),
   Location varchar(255)
 );
-LOAD DATA INFILE '/var/lib/mysql-files/311_Service_Requests_from_2011.csv' INTO TABLE nyc_open_data FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY ',' IGNORE 1 LINES;
+LOAD DATA INFILE '/var/lib/mysql-files/311_Service_Requests_from_2015.csv' INTO TABLE nyc_open_data FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY ',' IGNORE 1 LINES;
 update nyc_open_data set CreatedDate = STR_TO_DATE(CreatedDate, '%m/%d/%Y %r') where CreatedDate <> '';
 update nyc_open_data set ClosedDate = STR_TO_DATE(ClosedDate, '%m/%d/%Y %r') where ClosedDate <> '';
 update nyc_open_data set DueDate = STR_TO_DATE(DueDate, '%m/%d/%Y %r') where DueDate <> '';
@@ -70,3 +70,9 @@ alter table nyc_open_data modify CreatedDate datetime null;
 alter table nyc_open_data modify ClosedDate datetime null;
 alter table nyc_open_data modify DueDate datetime null;
 alter table nyc_open_data modify ResolutionActionUpdatedDate datetime null;
+
+ALTER TABLE `nyc_open_data` ADD INDEX `IX_ComplaintType` (`ComplaintType`);
+ALTER TABLE `nyc_open_data` ADD INDEX `IX_CreatedDate` (`CreatedDate`);
+ALTER TABLE `nyc_open_data` ADD INDEX `IX_LocationType` (`LocationType`);
+ALTER TABLE `nyc_open_data` ADD INDEX `IX_AgencyName` (`AgencyName`);
+ALTER TABLE `nyc_open_data` ADD INDEX `IX_City` (`City`);