Move spatial schema into kronolith.*.sql scripts

diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql
index 9570ac7..c75a8fb 100644 (file)
--- a/kronolith/scripts/sql/kronolith.mysql.sql
+++ b/kronolith/scripts/sql/kronolith.mysql.sql
@@ -95,3 +95,11 @@ CREATE TABLE kronolith_resources (
 
 CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
 CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
+
+CREATE TABLE kronolith_events_geo (
+    event_id VARCHAR(32) NOT NULL,
+    event_coordinates POINT NOT NULL,
+    SPATIAL INDEX (event_coordinates)
+);
+
+CREATE INDEX kronolith_events_geo_idx ON kronolith_events_geo (event_id);

diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql
index d96bc79..a99c841 100644 (file)
--- a/kronolith/scripts/sql/kronolith.sql
+++ b/kronolith/scripts/sql/kronolith.sql
@@ -95,3 +95,11 @@ CREATE TABLE kronolith_resources (
 
 CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
 CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
+
+CREATE TABLE kronolith_events_geo (
+    event_id VARCHAR(32) NOT NULL,
+    event_lat VARCHAR(32) NOT NULL,
+    event_lon VARCHAR(32) NOT NULL
+);
+
+CREATE INDEX kronolith_events_geo_idx ON kronolith_events_geo (event_id);

diff --git a/kronolith/scripts/sql/kronolith_geo.mysql.sql b/kronolith/scripts/sql/kronolith_geo.mysql.sql
deleted file mode 100644 (file)
index 4b10c55..0000000
--- a/kronolith/scripts/sql/kronolith_geo.mysql.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- This script creates the table and indexs necessary to use kronolith's geo
--- location features with a gis extension enabled mySQL database.
-
-CREATE TABLE kronolith_events_geo (
-    event_id VARCHAR(32) NOT NULL,
-    event_coordinates POINT NOT NULL,
-    SPATIAL INDEX (event_coordinates)
-);
-
-CREATE INDEX kronolith_events_geo_idx ON kronolith_events_geo (event_id);
\ No newline at end of file

diff --git a/kronolith/scripts/sql/kronolth_add_geo.sql b/kronolith/scripts/sql/kronolth_add_geo.sql
deleted file mode 100644 (file)
index bfeaf78..0000000
--- a/kronolith/scripts/sql/kronolth_add_geo.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Use this script to create the table and index necessary for geo location
--- support without mysql spatial extension support.
-CREATE TABLE kronolith_events_geo (
-    event_id VARCHAR(32) NOT NULL,
-    event_lat VARCHAR(32) NOT NULL,
-    event_lon VARCHAR(32) NOT NULL
-);
-
-CREATE INDEX kronolith_events_geo_idx ON kronolith_events_geo (event_id);
\ No newline at end of file