[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-67-gbaebbc8
Picca Frédéric-Emmanuel
picca at synchrotron-soleil.fr
Fri Oct 8 21:41:05 UTC 2010
The following commit has been merged in the master branch:
commit baebbc8b4c6bb78bf1c400e83cfeb4a12cdc90e1
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Fri Oct 8 22:09:41 2010 +0200
* add the tango database upgrade script 7.1.0 -> 7.2.0
diff --git a/debian/rules b/debian/rules
index 3c35850..5cbd852 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ override_dh_auto_install:
# install dbconfig-common scripts
install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/install
install -p -m 644 $(CURDIR)/$(BUILDROOT)/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 $(CURDIR)/debian/sql/upgrade-7.2.0~rc1+dfsg-1 debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql/7.2.0~rc1+dfsg-1
+
# install scripts used during the configuration
install -d debian/tmp/usr/share/tango-db
install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db_tables.sql debian/tmp/usr/share/tango-db/create_db_tables.sql
diff --git a/cppserver/database/stored_proc.sql.in b/debian/sql/upgrade-7.2.0~rc1+dfsg-1
similarity index 90%
copy from cppserver/database/stored_proc.sql.in
copy to debian/sql/upgrade-7.2.0~rc1+dfsg-1
index 52052f9..e06a326 100644
--- a/cppserver/database/stored_proc.sql.in
+++ b/debian/sql/upgrade-7.2.0~rc1+dfsg-1
@@ -1,12 +1,12 @@
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .ds_start;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .import_event;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .import_device;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .class_prop;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .dev_prop;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .class_att_prop;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .get_dev_list;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .dev_att_prop;
-DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .obj_prop;
+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;
#########################################################
@@ -30,7 +30,7 @@ DROP PROCEDURE IF EXISTS @TANGO_DB_NAME at .obj_prop;
#
DELIMITER |
-CREATE PROCEDURE @TANGO_DB_NAME at .ds_start
+CREATE PROCEDURE tango.ds_start
(IN ds_name VARCHAR(255),
IN host VARCHAR(255),
OUT res_str BLOB) READS SQL DATA COMMENT 'release 1.3'
@@ -47,7 +47,7 @@ proc: BEGIN
DECLARE cur_class_list CURSOR FOR
SELECT DISTINCT class
- FROM @TANGO_DB_NAME at .device
+ FROM tango.device
WHERE server = ds_name;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -59,7 +59,7 @@ proc: BEGIN
# import admin device
#
- CALL @TANGO_DB_NAME at .import_device(adm_dev_name,res_str);
+ CALL tango.import_device(adm_dev_name,res_str);
IF LOCATE('Not Found',res_str) != 0 OR LOCATE('MySQL Error',res_str) != 0 THEN
LEAVE proc;
@@ -70,7 +70,7 @@ proc: BEGIN
#
SET notifd_event_name = CONCAT(notifd_event_name,host);
- CALL @TANGO_DB_NAME at .import_event(notifd_event_name,res_str);
+ CALL tango.import_event(notifd_event_name,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR during import_event procedure for event factory';
@@ -81,7 +81,7 @@ proc: BEGIN
# import event channel for this server
#
- CALL @TANGO_DB_NAME at .import_event(adm_dev_name,res_str);
+ CALL tango.import_event(adm_dev_name,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR during import_event procedure for DS event channel';
@@ -92,7 +92,7 @@ proc: BEGIN
# Get all class properties for DServer class
#
- CALL @TANGO_DB_NAME at .class_prop('DServer',res_str);
+ CALL tango.class_prop('DServer',res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting DServer class property(ies)';
@@ -103,7 +103,7 @@ proc: BEGIN
# Get all class properties for Default class
#
- CALL @TANGO_DB_NAME at .class_prop('Default',res_str);
+ CALL tango.class_prop('Default',res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting Default class property(ies)';
@@ -114,7 +114,7 @@ proc: BEGIN
# Get all device properties for admin device
#
- CALL @TANGO_DB_NAME at .dev_prop(adm_dev_name,res_str);
+ CALL tango.dev_prop(adm_dev_name,res_str);
#
#
#
@@ -133,7 +133,7 @@ proc: BEGIN
IF tmp_class != 'dserver' THEN
SET class_nb = class_nb + 1;
- CALL @TANGO_DB_NAME at .class_prop(tmp_class,res_str);
+ CALL tango.class_prop(tmp_class,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting DS class(es) property(ies)';
@@ -141,7 +141,7 @@ proc: BEGIN
LEAVE proc;
END IF;
- CALL @TANGO_DB_NAME at .class_att_prop(tmp_class,res_str);
+ CALL tango.class_att_prop(tmp_class,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting DS class(es) attribute(s) property(ies)';
@@ -149,7 +149,7 @@ proc: BEGIN
LEAVE proc;
END IF;
- CALL @TANGO_DB_NAME at .get_dev_list(tmp_class,ds_name,res_str,dev_list,dev_nb);
+ CALL tango.get_dev_list(tmp_class,ds_name,res_str,dev_list,dev_nb);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting DS class(es) device list';
@@ -171,7 +171,7 @@ proc: BEGIN
END IF;
# select dev_list,d_name,pos,start;
- CALL @TANGO_DB_NAME at .dev_prop(d_name,res_str);
+ CALL tango.dev_prop(d_name,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting device property(ies)';
@@ -179,7 +179,7 @@ proc: BEGIN
LEAVE proc;
END IF;
- CALL @TANGO_DB_NAME at .dev_att_prop(d_name,res_str);
+ CALL tango.dev_att_prop(d_name,res_str);
IF LOCATE('MySQL Error',res_str) != 0 THEN
SET res_str = 'MySQL ERROR while getting device attribute property(ies)';
@@ -204,7 +204,7 @@ proc: BEGIN
SET ca_dev_name = 'Empty';
- CALL @TANGO_DB_NAME at .obj_prop('CtrlSystem',ca_dev_name,res_str);
+ CALL tango.obj_prop('CtrlSystem',ca_dev_name,res_str);
IF ca_dev_name != 'Empty' THEN
@@ -212,7 +212,7 @@ proc: BEGIN
# import control access service device
#
- CALL @TANGO_DB_NAME at .import_device(ca_dev_name,res_str);
+ CALL tango.import_device(ca_dev_name,res_str);
END IF;
@@ -226,7 +226,7 @@ END proc|
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .import_event
+CREATE PROCEDURE tango.import_event
(IN ev_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -245,7 +245,7 @@ BEGIN
SELECT exported,ior,version,pid,host
INTO tmp_exp,tmp_ior,tmp_version,tmp_pid,tmp_host
- FROM @TANGO_DB_NAME at .event
+ FROM tango.event
WHERE name = tmp_ev_name;
IF not_found = 1 THEN
@@ -263,7 +263,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .import_device
+CREATE PROCEDURE tango.import_device
(IN dev_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
imp_proc: BEGIN
@@ -278,7 +278,7 @@ imp_proc: BEGIN
SELECT exported,ior,version,pid,server,host,class
INTO tmp_exp,tmp_ior,tmp_version,tmp_pid,tmp_server,tmp_host,tmp_class
- FROM @TANGO_DB_NAME at .device
+ FROM tango.device
WHERE name = dev_name;
SET res_str = CONCAT_WS(CHAR(0),res_str,dev_name);
@@ -319,7 +319,7 @@ END imp_proc |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .class_prop
+CREATE PROCEDURE tango.class_prop
(IN class_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -331,7 +331,7 @@ BEGIN
DECLARE cur_class CURSOR FOR
SELECT name,count,value
- FROM @TANGO_DB_NAME at .property_class
+ FROM tango.property_class
WHERE class = class_name ORDER BY name,count;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -381,7 +381,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .dev_prop
+CREATE PROCEDURE tango.dev_prop
(IN dev_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -393,7 +393,7 @@ BEGIN
DECLARE cur_dev CURSOR FOR
SELECT name,count,value
- FROM @TANGO_DB_NAME at .property_device
+ FROM tango.property_device
WHERE device = dev_name ORDER BY name,count;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -444,7 +444,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .class_att_prop
+CREATE PROCEDURE tango.class_att_prop
(IN class_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -457,7 +457,7 @@ BEGIN
DECLARE cur_class_att_prop CURSOR FOR
SELECT attribute,name,count,value
- FROM @TANGO_DB_NAME at .property_attribute_class
+ FROM tango.property_attribute_class
WHERE class = class_name ORDER BY attribute,name,count;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -545,7 +545,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .dev_att_prop
+CREATE PROCEDURE tango.dev_att_prop
(IN dev_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -558,7 +558,7 @@ BEGIN
DECLARE cur_dev_att_prop CURSOR FOR
SELECT attribute,name,count,value
- FROM @TANGO_DB_NAME at .property_attribute_device
+ FROM tango.property_attribute_device
WHERE device = dev_name ORDER BY attribute,name,count;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -646,7 +646,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .get_dev_list
+CREATE PROCEDURE tango.get_dev_list
(IN class_name VARCHAR(255), IN serv VARCHAR(255),
INOUT res_str BLOB, OUT d_list TEXT, OUT d_num INT) READS SQL DATA
BEGIN
@@ -657,7 +657,7 @@ BEGIN
DECLARE cur_dev_list CURSOR FOR
SELECT name
- FROM @TANGO_DB_NAME at .device
+ FROM tango.device
WHERE class = class_name AND server = serv;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
@@ -694,7 +694,7 @@ END |
#########################################################
-CREATE PROCEDURE @TANGO_DB_NAME at .obj_prop
+CREATE PROCEDURE tango.obj_prop
(IN obj_name VARCHAR(255),OUT serv_dev_name VARCHAR(255),
INOUT res_str BLOB) READS SQL DATA
BEGIN
@@ -707,7 +707,7 @@ BEGIN
DECLARE cur_dev CURSOR FOR
SELECT name,count,value
- FROM @TANGO_DB_NAME at .property
+ FROM tango.property
WHERE object = obj_name ORDER BY count;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
diff --git a/debian/tango-db.install b/debian/tango-db.install
index b455a4c..6cf0512 100644
--- a/debian/tango-db.install
+++ b/debian/tango-db.install
@@ -1,3 +1,3 @@
usr/bin/DataBaseds usr/lib/tango
usr/share/tango-db
-usr/share/dbconfig-common/data/tango-db/install
+usr/share/dbconfig-common
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list