[tango] 04/04: add dbconfig-common scripts (Closes: #848137)
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Jan 16 10:52:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit 880074c385898d7e28bb1c98fedd3a432eb5f398
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Jan 16 11:46:14 2017 +0100
add dbconfig-common scripts (Closes: #848137)
the dbocnfig-common 1.x series was creating the
procedure with the dbsdmin credential. Now thaht
it is no more the case with the 2.x series. We need to
fix the tango-db database.
In coordination with the dbconfig-common upstream,
the dbconfig-common scripts upgrade will be used to drop all the
procedure. Then the upgrade scripts will regenerate
all of them with the right dbuser.
---
debian/changelog | 6 ++++++
.../data/tango-db/upgrade}/mysql/7.2.0 | 0
.../data/tango-db/upgrade}/mysql/7.2.6 | 0
.../data/tango-db/upgrade}/mysql/8.0.5 | 0
.../data/tango-db/upgrade}/mysql/8.1.2 | 0
.../data/tango-db/upgrade}/mysql/9.1.0 | 0
.../data/tango-db/upgrade}/mysql/9.2.0 | 0
.../data/tango-db/upgrade}/mysql/9.2.1 | 0
.../data/tango-db/upgrade}/mysql/9.2.5 | 0
.../dbconfig-common/scripts/tango-db/upgrade/mysql/9.1.0 | 15 +++++++++++++++
.../dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.0 | 15 +++++++++++++++
.../dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.1 | 15 +++++++++++++++
.../dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.5 | 15 +++++++++++++++
debian/patches/0001-debian-fix_database_scripts.patch | 14 +++++++-------
debian/rules | 8 ++++----
15 files changed, 77 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e4b733a..3e86e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tango (9.2.5a+dfsg1-1) unstable; urgency=medium
+
+ * Imported Upstream version 9.2.5a+dfsg1
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 16 Jan 2017 10:58:19 +0100
+
tango (9.2.5~rc2+dfsg1-1) unstable; urgency=medium
* New upstream version 9.2.5~rc2+dfsg1
diff --git a/debian/mysql/7.2.0 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/7.2.0
similarity index 100%
rename from debian/mysql/7.2.0
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/7.2.0
diff --git a/debian/mysql/7.2.6 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/7.2.6
similarity index 100%
rename from debian/mysql/7.2.6
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/7.2.6
diff --git a/debian/mysql/8.0.5 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/8.0.5
similarity index 100%
rename from debian/mysql/8.0.5
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/8.0.5
diff --git a/debian/mysql/8.1.2 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/8.1.2
similarity index 100%
rename from debian/mysql/8.1.2
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/8.1.2
diff --git a/debian/mysql/9.1.0 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/9.1.0
similarity index 100%
rename from debian/mysql/9.1.0
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/9.1.0
diff --git a/debian/mysql/9.2.0 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.0
similarity index 100%
rename from debian/mysql/9.2.0
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.0
diff --git a/debian/mysql/9.2.1 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.1
similarity index 100%
rename from debian/mysql/9.2.1
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.1
diff --git a/debian/mysql/9.2.5 b/debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.5
similarity index 100%
rename from debian/mysql/9.2.5
rename to debian/dbconfig-common/data/tango-db/upgrade/mysql/9.2.5
diff --git a/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.1.0 b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.1.0
new file mode 100644
index 0000000..bb9b46a
--- /dev/null
+++ b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.1.0
@@ -0,0 +1,15 @@
+DROP PROCEDURE IF EXISTS tango.ds_start;
+DROP PROCEDURE IF EXISTS tango.import_event;
+DROP PROCEDURE IF EXISTS tango.import_device;
+DROP PROCEDURE IF EXISTS tango.class_prop;
+DROP PROCEDURE IF EXISTS tango.dev_prop;
+DROP PROCEDURE IF EXISTS tango.class_att_prop;
+DROP PROCEDURE IF EXISTS tango.get_dev_list;
+DROP PROCEDURE IF EXISTS tango.dev_att_prop;
+DROP PROCEDURE IF EXISTS tango.obj_prop;
+DROP PROCEDURE IF EXISTS tango.class_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.dev_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.proc_release_nb;
+
+DROP PROCEDURE IF EXISTS tango.init_history_ids;
+DROP PROCEDURE IF EXISTS tango.init_tac_tables;
diff --git a/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.0 b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.0
new file mode 100644
index 0000000..bb9b46a
--- /dev/null
+++ b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.0
@@ -0,0 +1,15 @@
+DROP PROCEDURE IF EXISTS tango.ds_start;
+DROP PROCEDURE IF EXISTS tango.import_event;
+DROP PROCEDURE IF EXISTS tango.import_device;
+DROP PROCEDURE IF EXISTS tango.class_prop;
+DROP PROCEDURE IF EXISTS tango.dev_prop;
+DROP PROCEDURE IF EXISTS tango.class_att_prop;
+DROP PROCEDURE IF EXISTS tango.get_dev_list;
+DROP PROCEDURE IF EXISTS tango.dev_att_prop;
+DROP PROCEDURE IF EXISTS tango.obj_prop;
+DROP PROCEDURE IF EXISTS tango.class_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.dev_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.proc_release_nb;
+
+DROP PROCEDURE IF EXISTS tango.init_history_ids;
+DROP PROCEDURE IF EXISTS tango.init_tac_tables;
diff --git a/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.1 b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.1
new file mode 100644
index 0000000..bb9b46a
--- /dev/null
+++ b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.1
@@ -0,0 +1,15 @@
+DROP PROCEDURE IF EXISTS tango.ds_start;
+DROP PROCEDURE IF EXISTS tango.import_event;
+DROP PROCEDURE IF EXISTS tango.import_device;
+DROP PROCEDURE IF EXISTS tango.class_prop;
+DROP PROCEDURE IF EXISTS tango.dev_prop;
+DROP PROCEDURE IF EXISTS tango.class_att_prop;
+DROP PROCEDURE IF EXISTS tango.get_dev_list;
+DROP PROCEDURE IF EXISTS tango.dev_att_prop;
+DROP PROCEDURE IF EXISTS tango.obj_prop;
+DROP PROCEDURE IF EXISTS tango.class_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.dev_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.proc_release_nb;
+
+DROP PROCEDURE IF EXISTS tango.init_history_ids;
+DROP PROCEDURE IF EXISTS tango.init_tac_tables;
diff --git a/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.5 b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.5
new file mode 100644
index 0000000..bb9b46a
--- /dev/null
+++ b/debian/dbconfig-common/scripts/tango-db/upgrade/mysql/9.2.5
@@ -0,0 +1,15 @@
+DROP PROCEDURE IF EXISTS tango.ds_start;
+DROP PROCEDURE IF EXISTS tango.import_event;
+DROP PROCEDURE IF EXISTS tango.import_device;
+DROP PROCEDURE IF EXISTS tango.class_prop;
+DROP PROCEDURE IF EXISTS tango.dev_prop;
+DROP PROCEDURE IF EXISTS tango.class_att_prop;
+DROP PROCEDURE IF EXISTS tango.get_dev_list;
+DROP PROCEDURE IF EXISTS tango.dev_att_prop;
+DROP PROCEDURE IF EXISTS tango.obj_prop;
+DROP PROCEDURE IF EXISTS tango.class_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.dev_pipe_prop;
+DROP PROCEDURE IF EXISTS tango.proc_release_nb;
+
+DROP PROCEDURE IF EXISTS tango.init_history_ids;
+DROP PROCEDURE IF EXISTS tango.init_tac_tables;
diff --git a/debian/patches/0001-debian-fix_database_scripts.patch b/debian/patches/0001-debian-fix_database_scripts.patch
index 8ee5fe2..0570312 100644
--- a/debian/patches/0001-debian-fix_database_scripts.patch
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -10,18 +10,18 @@ update the database creation script to deal with the debian path
Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
---
- cppserver/database/create_db.sql.in | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ cppserver/database/create_db.sql.in | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/cppserver/database/create_db.sql.in b/cppserver/database/create_db.sql.in
-index 776051d..81ae48d 100644
+index 776051d..2211c24 100644
--- a/cppserver/database/create_db.sql.in
+++ b/cppserver/database/create_db.sql.in
-@@ -1,18 +1,16 @@
--
--CREATE DATABASE @TANGO_DB_NAME@;
- USE @TANGO_DB_NAME@;
+@@ -1,18 +1,15 @@
+-CREATE DATABASE @TANGO_DB_NAME@;
+-USE @TANGO_DB_NAME@;
+-
#
# Create all database tables
#
diff --git a/debian/rules b/debian/rules
index 3e8c9fd..93dd448 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,8 @@ export LYX_USERDIR_21x=$(CURDIR)/
sql:
./configure $(CONFIGURE_OPTS)
# use this target to generate the dbconfig-common upgrade script once the debian/changelog is ok
- echo "USE tango;\n" > debian/mysql/$(VERSION)
- cat cppserver/database/stored_proc.sql >> debian/mysql/$(VERSION)
+ echo "USE tango;\n" > debian/dbconfig-common/data/tango-db/upgrade/mysql/$(VERSION)
+ cat cppserver/database/stored_proc.sql >> debian/dbconfig-common/data/tango-db/upgrade/mysql/$(VERSION)
$(MAKE) distclean
# 816173
@@ -39,8 +39,8 @@ override_dh_auto_install-arch:
# install dbconfig-common scripts
install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/install
install -p -m 644 cppserver/database/create_db.sql debian/tmp/usr/share/dbconfig-common/data/tango-db/install/mysql
- install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql
- install -p -m 644 debian/mysql/* debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql
+ install -d debian/tmp/usr/share/
+ cp -r debian/dbconfig-common debian/tmp/usr/share
# install scripts used during the configuration
install -d debian/tmp/usr/share/tango-db
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list