Minor changes to database tables

diff --git a/misc/databaseScripts/create_database_V0.1.sql b/misc/databaseScripts/create_database_V0.1.sql
index 4f16f9c..0d7fdf7 100644 (file)
--- a/misc/databaseScripts/create_database_V0.1.sql
+++ b/misc/databaseScripts/create_database_V0.1.sql
@@ -45,9 +45,8 @@ CREATE TABLE {prefix}regions (
 
 CREATE TABLE {prefix}members (
   id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
-  member_type ENUM('onething','somethingelse') NULL,
+  status INT NULL,
+  member_type INT NULL,
   name TINYTEXT NULL,
   descr TEXT NULL,
   short_descr TINYTEXT NULL,
@@ -76,8 +75,7 @@ CREATE TABLE {prefix}members (
 
 CREATE TABLE {prefix}locations (
   id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
+  status INT NULL,
   location_type ENUM('hotel','restaurant') NULL,
   member INT NULL,
   name TINYTEXT NULL,
@@ -106,8 +104,7 @@ CREATE TABLE {prefix}locations (
 
 CREATE TABLE {prefix}facilities (
   id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
+  status INT NULL,
   facility_type ENUM('hotel_motel','bandb','restaurant','golf') NULL,
   location INT NULL,
   name TINYTEXT NULL,
@@ -135,8 +132,7 @@ CREATE TABLE {prefix}facilities (
 
 CREATE TABLE {prefix}activties (
   id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
+  status INT NULL,
   activity_type TINYTEXT NULL,
   facility INT NULL,
   name TINYTEXT NULL,
@@ -154,10 +150,121 @@ CREATE TABLE {prefix}activties (
 
 ----
 
+CREATE TABLE {prefix}accommodations (
+  id INT NOT NULL AUTO_INCREMENT,
+  status INT NULL,
+  name TINYTEXT NULL,
+  descr TEXT NULL,
+  short_descr TINYTEXT NULL,
+  quant INT NULL,
+  reservation_url TINYTEXT NULL,
+  reservation_id TINYTEXT NULL,
+  year_round TINYINT(1) NULL,
+  ref_type ENUM('member','location','facility') NULL,
+  ref_dest INT NULL,
+  PRIMARY KEY (id)
+);
+
+----
+
+CREATE TABLE {prefix}golf (
+  id INT NOT NULL AUTO_INCREMENT,
+  status INT NULL,
+  name TINYTEXT NULL,
+  descr TEXT NULL,
+  short_descr TINYTEXT NULL,
+  rating TINYTEXT NULL,
+  par TINYTEXT NULL,
+  yardage TINYTEXT NULL,
+  slope TINYTEXT NULL,
+  walking TINYINT(1) NULL,
+  holes ENUM('9','18') NULL,
+  reservation_url TINYTEXT NULL,
+  ref_type ENUM('member','location','facility') NULL,
+  ref_dest INT NULL,
+  PRIMARY KEY (id)
+);
+
+----
+
+CREATE TABLE {prefix}restaurants (
+  id INT NOT NULL AUTO_INCREMENT,
+  status INT NULL,
+  name TINYTEXT NULL,
+  descr TEXT NULL,
+  short_descr TINYTEXT NULL,
+  menu TEXT NULL,
+  special_menu TEXT NULL,
+  url TINYTEXT NULL,
+  reservation_url TINYTEXT NULL,
+  phone TINYTEXT NULL,
+  hours_descr TINYTEXT NULL,
+  alcohol TINYINT(1) NULL,
+  non_smoking TINYINT(1) NULL,
+  notes TEXT NULL,
+  ref_type ENUM('member','location','facility') NULL,
+  ref_dest INT NULL,
+  PRIMARY KEY (id)
+);
+
+----
+
+CREATE TABLE {prefix}meals (
+  id INT NOT NULL AUTO_INCREMENT,
+  status INT NULL,
+  name TINYTEXT NULL,
+  descr TEXT NULL,
+  short_descr TINYTEXT NULL,
+  menu TEXT NULL,
+  special_menu TEXT NULL,
+  daily_time TINYINT(1) NULL,
+  daily_start_time TIME NULL,
+  daily_end_time TIME NULL,
+  daily_res_req TINYINT(1) NULL,
+  sunday TINYINT(1) NULL,
+  sun_menu TEXT NULL,
+  sun_start_time TIME NULL,
+  sun_end_time TIME NULL,
+  sun_res_req TINYINT(1) NULL,
+  monday TINYINT(1) NULL,
+  mon_menu TEXT NULL,
+  mon_start_time TIME NULL,
+  mon_end_time TIME NULL,
+  mon_res_req TINYINT(1) NULL,
+  tuesday TINYINT(1) NULL,
+  tue_menu TEXT NULL,
+  tue_start_time TIME NULL,
+  tue_end_time TIME NULL,
+  tue_res_req TINYINT(1) NULL,
+  wednesday TINYINT(1) NULL,
+  wed_menu TEXT NULL,
+  wed_start_time TIME NULL,
+  wed_end_time TIME NULL,
+  wed_res_req TINYINT(1) NULL,
+  thursday TINYINT(1) NULL,
+  thu_menu TEXT NULL,
+  thu_start_time TIME NULL,
+  thu_end_time TIME NULL,
+  thu_res_req TINYINT(1) NULL,
+  friday TINYINT(1) NULL,
+  fri_menu TEXT NULL,
+  fri_start_time TIME NULL,
+  fri_end_time TIME NULL,
+  fri_res_req TINYINT(1) NULL,
+  saturday TINYINT(1) NULL,
+  sat_menu TEXT NULL,
+  sat_start_time TIME NULL,
+  sat_end_time TIME NULL,
+  sat_res_req TINYINT(1) NULL,
+  restaurant INT NULL,
+  PRIMARY KEY (id)
+);
+
+----
+
 CREATE TABLE {prefix}contacts (
   id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archive TINYINT(1) NULL,
+  status INT NULL,
   ref_type ENUM('member','location','facility','activity') NULL,
   ref_dest INT NULL,
   fname TINYTEXT NULL,
@@ -233,24 +340,6 @@ CREATE TABLE {prefix}amenity_member (
 
 ----
 
-CREATE TABLE {prefix}accommodations (
-  id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
-  name TINYTEXT NULL,
-  descr TEXT NULL,
-  short_descr TINYTEXT NULL,
-  quant INT NULL,
-  reservation_url TINYTEXT NULL,
-  reservation_id TINYTEXT NULL,
-  year_round TINYINT(1) NULL,
-  ref_type ENUM('member','location','facility') NULL,
-  ref_dest INT NULL,
-  PRIMARY KEY (id)
-);
-
-----
-
 CREATE TABLE {prefix}accounts (
   id INT NOT NULL AUTO_INCREMENT,
   member INT NULL,
@@ -283,50 +372,6 @@ CREATE TABLE {prefix}category_member (
 
 ----
 
-CREATE TABLE {prefix}golf (
-  id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
-  name TINYTEXT NULL,
-  descr TEXT NULL,
-  short_descr TINYTEXT NULL,
-  rating TINYTEXT NULL,
-  par TINYTEXT NULL,
-  yardage TINYTEXT NULL,
-  slope TINYTEXT NULL,
-  walking TINYINT(1) NULL,
-  holes ENUM('9','18') NULL,
-  reservation_url TINYTEXT NULL,
-  ref_type ENUM('member','location','facility') NULL,
-  ref_dest INT NULL,
-  PRIMARY KEY (id)
-);
-
-----
-
-CREATE TABLE {prefix}restaurants (
-  id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
-  name TINYTEXT NULL,
-  descr TEXT NULL,
-  short_descr TINYTEXT NULL,
-  menu TEXT NULL,
-  special_menu TEXT NULL,
-  url TINYTEXT NULL,
-  reservation_url TINYTEXT NULL,
-  phone TINYTEXT NULL,
-  hours_descr TINYTEXT NULL,
-  alcohol TINYINT(1) NULL,
-  non_smoking TINYINT(1) NULL,
-  notes TEXT NULL,
-  ref_type ENUM('member','location','facility') NULL,
-  ref_dest INT NULL,
-  PRIMARY KEY (id)
-);
-
-----
-
 CREATE TABLE {prefix}files (
   id INT NOT NULL AUTO_INCREMENT,
   name TINYTEXT NULL,
@@ -355,57 +400,3 @@ CREATE TABLE {prefix}images (
   ref_dest INT NULL,
   PRIMARY KEY (id)
 );
-
-----
-
-CREATE TABLE {prefix}meals (
-  id INT NOT NULL AUTO_INCREMENT,
-  active TINYINT(1) NULL,
-  archived TINYINT(1) NULL,
-  name TINYTEXT NULL,
-  descr TEXT NULL,
-  short_descr TINYTEXT NULL,
-  menu TEXT NULL,
-  special_menu TEXT NULL,
-  daily_time TINYINT(1) NULL,
-  daily_start_time TIME NULL,
-  daily_end_time TIME NULL,
-  daily_res_req TINYINT(1) NULL,
-  sunday TINYINT(1) NULL,
-  sun_menu TEXT NULL,
-  sun_start_time TIME NULL,
-  sun_end_time TIME NULL,
-  sun_res_req TINYINT(1) NULL,
-  monday TINYINT(1) NULL,
-  mon_menu TEXT NULL,
-  mon_start_time TIME NULL,
-  mon_end_time TIME NULL,
-  mon_res_req TINYINT(1) NULL,
-  tuesday TINYINT(1) NULL,
-  tue_menu TEXT NULL,
-  tue_start_time TIME NULL,
-  tue_end_time TIME NULL,
-  tue_res_req TINYINT(1) NULL,
-  wednesday TINYINT(1) NULL,
-  wed_menu TEXT NULL,
-  wed_start_time TIME NULL,
-  wed_end_time TIME NULL,
-  wed_res_req TINYINT(1) NULL,
-  thursday TINYINT(1) NULL,
-  thu_menu TEXT NULL,
-  thu_start_time TIME NULL,
-  thu_end_time TIME NULL,
-  thu_res_req TINYINT(1) NULL,
-  friday TINYINT(1) NULL,
-  fri_menu TEXT NULL,
-  fri_start_time TIME NULL,
-  fri_end_time TIME NULL,
-  fri_res_req TINYINT(1) NULL,
-  saturday TINYINT(1) NULL,
-  sat_menu TEXT NULL,
-  sat_start_time TIME NULL,
-  sat_end_time TIME NULL,
-  sat_res_req TINYINT(1) NULL,
-  restaurant INT NULL,
-  PRIMARY KEY (id)
-);

diff --git a/misc/databaseScripts/drop_database_V0.1.sql b/misc/databaseScripts/drop_database_V0.1.sql
index 924dca1..54c65c1 100644 (file)
--- a/misc/databaseScripts/drop_database_V0.1.sql
+++ b/misc/databaseScripts/drop_database_V0.1.sql
@@ -4,27 +4,27 @@
 -- Database Deletion Script
 
 DROP TABLE
+    {prefix}members,
+    {prefix}locations,
+    {prefix}facilities,
+    {prefix}activties,
     {prefix}accommodations,
+    {prefix}golf,
+    {prefix}restaurants,
+    {prefix}meals,
+    {prefix}contacts,
     {prefix}accounts,
-       {prefix}activties,
        {prefix}amenities,
        {prefix}amenity_member,
        {prefix}categories,
        {prefix}category_member,
-       {prefix}cities,
-       {prefix}contacts,
-       {prefix}countries,
-       {prefix}facilities,
        {prefix}files,
-       {prefix}golf,
        {prefix}images,
-       {prefix}locations,
-       {prefix}meals,
-       {prefix}members,
        {prefix}regions,
-       {prefix}restaurants,
        {prefix}social_media,
        {prefix}social_media_member,
-       {prefix}states
+    {prefix}cities,
+    {prefix}states,
+       {prefix}countries
 ;