From ca8f0a53b3a9b146039b5be5e0dea246bf37a538 Mon Sep 17 00:00:00 2001
From: XTZGZoReX <none@none>
Date: Mon, 7 Jun 2010 01:44:40 +0200
Subject: [PATCH] * Cleanup in sql directory.

--HG--
branch : trunk
---
 sql/CMakeLists.txt                             | 2 +-
 sql/{realmd.sql => auth_database.sql}          | 0
 sql/{characters.sql => character_database.sql} | 0
 sql/full/CMakeLists.txt                        | 4 +---
 sql/tools/CMakeLists.txt                       | 5 +++++
 sql/{ => tools}/create_mysql.sql               | 0
 sql/{ => tools}/drop_mysql.sql                 | 0
 sql/updates/2.4.3_old/CMakeLists.txt           | 4 +---
 sql/updates/3.0.9_old/CMakeLists.txt           | 4 +---
 sql/updates/3.1.3_old/CMakeLists.txt           | 4 +---
 sql/updates/3.2.2a_old/CMakeLists.txt          | 4 +---
 sql/updates/3.3.2_old/CMakeLists.txt           | 4 +---
 sql/updates/3.3.3a_old/CMakeLists.txt          | 4 +---
 sql/updates/CMakeLists.txt                     | 4 +---
 sql/{world.sql => world_database.sql}          | 0
 15 files changed, 14 insertions(+), 25 deletions(-)
 rename sql/{realmd.sql => auth_database.sql} (100%)
 rename sql/{characters.sql => character_database.sql} (100%)
 create mode 100644 sql/tools/CMakeLists.txt
 rename sql/{ => tools}/create_mysql.sql (100%)
 rename sql/{ => tools}/drop_mysql.sql (100%)
 rename sql/{world.sql => world_database.sql} (100%)

diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 7f562ce1dfb..e662e2fe07d 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(updates)
-add_subdirectory(FULL)
+add_subdirectory(full)
 
 ########### install files ###############
 
diff --git a/sql/realmd.sql b/sql/auth_database.sql
similarity index 100%
rename from sql/realmd.sql
rename to sql/auth_database.sql
diff --git a/sql/characters.sql b/sql/character_database.sql
similarity index 100%
rename from sql/characters.sql
rename to sql/character_database.sql
diff --git a/sql/full/CMakeLists.txt b/sql/full/CMakeLists.txt
index 6c48ff4c8ca..554ff9ba184 100644
--- a/sql/full/CMakeLists.txt
+++ b/sql/full/CMakeLists.txt
@@ -1,7 +1,5 @@
 ########### install files ###############
 
 FILE(GLOB _SQL *.sql)
-FILE(GLOB README readme.txt)
 
-install(FILES ${_SQL} DESTINATION share/trinity/sql/FULL)
-install(FILES ${README} DESTINATION share/trinity/sql/FULL)
\ No newline at end of file
+install(FILES ${README} DESTINATION share/trinity/sql/full)
\ No newline at end of file
diff --git a/sql/tools/CMakeLists.txt b/sql/tools/CMakeLists.txt
new file mode 100644
index 00000000000..91cb61ec84e
--- /dev/null
+++ b/sql/tools/CMakeLists.txt
@@ -0,0 +1,5 @@
+########### install files ###############
+
+FILE(GLOB _SQL *.sql)
+
+install(FILES ${_SQL} DESTINATION share/trinity/sql/tools)
\ No newline at end of file
diff --git a/sql/create_mysql.sql b/sql/tools/create_mysql.sql
similarity index 100%
rename from sql/create_mysql.sql
rename to sql/tools/create_mysql.sql
diff --git a/sql/drop_mysql.sql b/sql/tools/drop_mysql.sql
similarity index 100%
rename from sql/drop_mysql.sql
rename to sql/tools/drop_mysql.sql
diff --git a/sql/updates/2.4.3_old/CMakeLists.txt b/sql/updates/2.4.3_old/CMakeLists.txt
index 229a6de626c..585813a934b 100644
--- a/sql/updates/2.4.3_old/CMakeLists.txt
+++ b/sql/updates/2.4.3_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_243 *.sql)
 
-INSTALL(FILES
-${_SQL_243}
-DESTINATION share/trinity/sql/updates/2.4.3_updates)
\ No newline at end of file
+INSTALL(FILES ${_SQL_243} DESTINATION share/trinity/sql/updates/2.4.3_old)
\ No newline at end of file
diff --git a/sql/updates/3.0.9_old/CMakeLists.txt b/sql/updates/3.0.9_old/CMakeLists.txt
index 7d2b2d975d3..d09917d76f9 100644
--- a/sql/updates/3.0.9_old/CMakeLists.txt
+++ b/sql/updates/3.0.9_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_309 *.sql)
 
-INSTALL(FILES
-${_SQL_309}
-DESTINATION share/trinity/sql/updates/3.0.9_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_309} DESTINATION share/trinity/sql/updates/3.0.9_old)
\ No newline at end of file
diff --git a/sql/updates/3.1.3_old/CMakeLists.txt b/sql/updates/3.1.3_old/CMakeLists.txt
index 1c99a2be619..5a99663dff5 100644
--- a/sql/updates/3.1.3_old/CMakeLists.txt
+++ b/sql/updates/3.1.3_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_313 *.sql)
 
-INSTALL(FILES
-${_SQL_313}
-DESTINATION share/trinity/sql/updates/3.1.3_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_313} DESTINATION share/trinity/sql/updates/3.1.3_old)
\ No newline at end of file
diff --git a/sql/updates/3.2.2a_old/CMakeLists.txt b/sql/updates/3.2.2a_old/CMakeLists.txt
index e6193267b8a..391d4895850 100644
--- a/sql/updates/3.2.2a_old/CMakeLists.txt
+++ b/sql/updates/3.2.2a_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_322 *.sql)
 
-INSTALL(FILES
-${_SQL_322}
-DESTINATION share/trinity/sql/updates/3.2.2a_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_322} DESTINATION share/trinity/sql/updates/3.2.2a_old)
\ No newline at end of file
diff --git a/sql/updates/3.3.2_old/CMakeLists.txt b/sql/updates/3.3.2_old/CMakeLists.txt
index 87734d93da3..75f051dcede 100644
--- a/sql/updates/3.3.2_old/CMakeLists.txt
+++ b/sql/updates/3.3.2_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_332 *.sql)
 
-INSTALL(FILES
-${_SQL_332}
-DESTINATION share/trinity/sql/updates/3.3.2_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_332} DESTINATION share/trinity/sql/updates/3.3.2_old)
\ No newline at end of file
diff --git a/sql/updates/3.3.3a_old/CMakeLists.txt b/sql/updates/3.3.3a_old/CMakeLists.txt
index 94143fe1e5b..8557b4d4bf3 100644
--- a/sql/updates/3.3.3a_old/CMakeLists.txt
+++ b/sql/updates/3.3.3a_old/CMakeLists.txt
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_333 *.sql)
 
-INSTALL(FILES
-${_SQL_333}
-DESTINATION share/trinity/sql/updates/3.3.3a_old)
\ No newline at end of file
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.3a_old)
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 68639a4b265..0d2d6cd6bfa 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -7,6 +7,4 @@ add_subdirectory(3.3.3a_old)
 
 FILE(GLOB _SQL_UPDATES *.sql)
 
-INSTALL(FILES
-${_SQL_UPDATES}
-DESTINATION share/trinity/sql/updates)
+INSTALL(FILES ${_SQL_UPDATES} DESTINATION share/trinity/sql/updates)
diff --git a/sql/world.sql b/sql/world_database.sql
similarity index 100%
rename from sql/world.sql
rename to sql/world_database.sql