put the name of the database in a variable

[moira.git] / server / cache.dc

diff --git a/server/cache.dc b/server/cache.dc
index 346245dafd754467ac6a5556d5ae344b3b21bb4e..ae04014bf0f208fc18515c72741ce531891b2843 100644 (file)
--- a/server/cache.dc
+++ b/server/cache.dc
@@ -146,7 +146,7 @@ int *id;
        break;
     case 'M':
     case 'm':
-       EXEC SQL SELECT mach_id INTO :j FROM machine WHERE name=uppercase(:iname);
+       EXEC SQL SELECT mach_id INTO :j FROM machine WHERE name=UPPERCASE(:iname);
        break;
     case 'C':
     case 'c':
@@ -235,27 +235,27 @@ char **name;
     switch (*type) {
     case 'U':
     case 'u':
-       EXEC SQL SELECT login INTO :iname FROM users WHERE users_id=:j;
+       EXEC SQL SELECT CHAR(login) INTO :iname FROM users WHERE users_id=:j;
        break;
     case 'L':
     case 'l':
-       EXEC SQL SELECT name INTO :iname FROM list WHERE list_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM list WHERE list_id=:j;
        break;
     case 'M':
     case 'm':
-       EXEC SQL SELECT name INTO :iname FROM machine WHERE mach_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM machine WHERE mach_id=:j;
        break;
     case 'C':
     case 'c':
-       EXEC SQL SELECT name INTO :iname FROM cluster WHERE clu_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM cluster WHERE clu_id=:j;
        break;
     case 'F':
     case 'f':
-       EXEC SQL SELECT label INTO :iname FROM filesys WHERE filsys_id=:j;
+       EXEC SQL SELECT CHAR(label) INTO :iname FROM filesys WHERE filsys_id=:j;
        break;
     case 'S':
     case 's':
-       EXEC SQL SELECT string INTO :iname FROM strings WHERE string_id=:j;
+       EXEC SQL SELECT CHAR(string) INTO :iname FROM strings WHERE string_id=:j;
        break;
     default:
        return(MR_INTERNAL);