#endif lint
#include <mit-copyright.h>
+#include <string.h>
#include "query.h"
#include "mr_server.h"
EXEC SQL INCLUDE sqlca; /* SQL Communications Area */
MR_SQLDA_T *SQLDA;
EXEC SQL BEGIN DECLARE SECTION;
+int mr_sig_length;
int idummy;
char cdummy[MR_CDUMMY_LEN];
char stmt_buf[MR_STMTBUF_LEN];
int mr_errcode = 0;
EXEC SQL BEGIN DECLARE SECTION;
int query_timeout = 30;
+char *database = "moira";
EXEC SQL END DECLARE SECTION;
extern char *whoami;
extern FILE *journal;
-/** Maybe this should be replaced by something like tytso's sql_error */
-
-#define INGRES_BAD_DATE1 41206
-#define INGRES_BAD_DATE2 40207
-#define INGRES_DEADLOCK 49900
-
+#define INGRES_BAD_DATE1 40206
+#define INGRES_BAD_DATE2 40207
+#define INGRES_DEADLOCK 49900
+#define INGRES_TIMEOUT 39100
#define INGRES_BAD_COLUMN 30110
#define INGRES_ASGN_ERR 40204
#define INGRES_NO_CURSOR 30120
#define INGRES_NO_STMT 30130
/*
-#define INGRES_BAD_INT
-#define INGRES_TIMEOUT
-#define INGRES_NO_RANGE
- */
-
-
-/*
- * ingerr: (supposedly) called when Ingres indicates an error.
- * I have not yet been able to get this to work to intercept a
- * database open error.
+ * ingerr: Called when Ingres indicates an error.
*/
void ingerr()
ingres_errno = -sqlca.sqlcode;
switch (ingres_errno) {
-/*
- * case INGRES_BAD_INT:
- * mr_errcode = MR_INTEGER;
- * break;
- */
- case INGRES_BAD_DATE1:
- case INGRES_BAD_DATE2:
+ case INGRES_BAD_DATE1:
+ case INGRES_BAD_DATE2:
mr_errcode = MR_DATE;
break;
- case INGRES_DEADLOCK:
+ case INGRES_DEADLOCK:
mr_errcode = MR_DEADLOCK;
com_err(whoami, 0, "INGRES deadlock detected");
break;
-/* I just don't know what the equivalent to this is, yet.
- * case INGRES_TIMEOUT:
- * mr_errcode = MR_BUSY;
- * com_err(whoami, 0, "timed out getting lock");
- * break;
- */
-/* This probably has no equivalent.
- * case INGRES_NO_RANGE:
- * mr_errcode = MR_INGRES_SOFTFAIL;
- * com_err(whoami, 0, "INGRES missing range statement");
- * break;
- */
-#ifdef NEVER
- /* #ifdef-ing these out lets default: give me the INGRES text */
- case INGRES_BAD_COLUMN:
- mr_errcode = MR_INTERNAL;
- com_err(whoami, 0, "Bad column name in query table");
- break;
- case INGRES_ASGN_ERR:
- mr_errcode = MR_INTERNAL;
- com_err(whoami, 0, "Error in SQL assignment statement");
- break;
- case INGRES_NO_CURSOR:
+ case INGRES_TIMEOUT:
+/* May be something other than timeout! #39100 is "Unknown error"
+ * Really should parse the error message enough to decide if it's a timeout */
+ mr_errcode = MR_BUSY;
+ com_err(whoami, 0, "timed out getting lock");
+ break;
+/* These should never come up unless someone breaks the query table */
+ case INGRES_NO_CURSOR:
mr_errcode = MR_INTERNAL;
com_err(whoami, 0, "Cursor not opened");
break;
- case INGRES_NO_STMT:
+ case INGRES_NO_STMT:
mr_errcode = MR_INTERNAL;
com_err(whoami, 0, "Statement not declared");
break;
-#endif
- default:
- /** Add the INGRES error_text to the alert message ??? **/
+ case INGRES_BAD_COLUMN:
+ mr_errcode = MR_INTERNAL;
+ com_err(whoami, 0, "Bad column name in query table");
+ break;
+ case INGRES_ASGN_ERR:
+ mr_errcode = MR_INTERNAL;
+ com_err(whoami, 0, "Error in SQL assignment statement");
+ break;
+/* Others ??? */
+ default:
mr_errcode = MR_INGRES_ERR;
com_err(whoami, MR_INGRES_ERR, " code %d\n", ingres_errno);
EXEC SQL INQUIRE_SQL(:err_msg = errortext);
/* open the database */
#ifsql INGRES
- EXEC SQL CONNECT moira;
+ EXEC SQL CONNECT :database;
+ if(ingres_errno)
+ return (ingres_errno);
EXEC SQL set lockmode session where level = table, timeout = :query_timeout;
EXEC SQL set lockmode on capacls where readlock = shared;
EXEC SQL set lockmode on alias where readlock = shared;
#ifsql INFORMIX
EXEC SQL DATABASE moira
#endsql
- return ingres_errno;
+
+ if(ingres_errno)
+ return(mr_errcode);
+
+ EXEC SQL SELECT SIZE(signature) INTO :mr_sig_length FROM users WHERE users_id=0; /* Harmless on second open */
+ EXEC SQL COMMIT WORK;
+ if(ingres_errno)
+ return(mr_errcode);
+
+ return(MR_SUCCESS);
}
int mr_close_database()
if (status != MR_NO_MATCH) break;
}
-#ifdef NEVER
- /* This is now done by a valobj, which also fetches the id value */
-
- /* increment id number if necessary */
- if (v->object_id) {
- status = set_next_object_id(v->object_id, q->rtable, 0);
- if (status != MR_SUCCESS) break;
- }
-#endif
-
/* build "where" clause if needed */
if (q->qual) {
build_qual(q->qual, q->argc, Argv, qual);
status = do_append(q, &Argv[q->argc], pqual, action, actarg);
if (status != MR_SUCCESS) break;
if (v && v->object_id) {
- sprintf(qual, "%s.%s = %s",q->rtable, v->object_id,
+ sprintf(qual, "%s.%s = %s",q->rvar, v->object_id,
Argv[q->argc+q->vcnt]);
incremental_after(q->rtable, qual, argv_ro);
} else
register struct validate *v = q->validate;
register int i;
register int privileged = 0;
- int len;
+ register char *to,*fr,*stop;
/* copy the arguments into a local argv that we can modify */
if (argc >= QMAXARGS)
return(MR_ARGS);
for (i = 0; i < argc; i++) {
- if ((len = strlen(argv_ro[i])) < ARGLEN)
- strcpy(Argv[i], argv_ro[i]);
- else
- return(MR_ARG_TOO_LONG);
- if (Argv[i][len-1] == '\\')
+ /* Single quotes must be doubled for SQL */
+ for (to=Argv[i], fr=argv_ro[i], stop=to+ARGLEN; (*fr) && (to<stop);) {
+ if(*fr=='\'')
+ *to++ = *fr;
+ *to++ = *fr++;
+ }
+ if (*fr)
+ return(MR_ARG_TOO_LONG);
+ *to='\0';
+
+ if (*--to == '\\')
return(MR_BAD_CHAR);
}
build_sql_stmt(stmt_buf,"SELECT",q->tlist,vaddrs,pqual);
if(psort) { strcat(stmt_buf," ORDER BY "); strcat(stmt_buf,psort); }
EXEC SQL PREPARE stmt INTO :SQLDA USING NAMES FROM :stmt_buf;
- if(ingres_errno)
- return(mr_errcode);
- if((mr_errcode=mr_check_SQLDA(SQLDA)) != MR_SUCCESS)
- return(mr_errcode);
+ if(sqlca.sqlcode)
+ return(MR_INTERNAL);
EXEC SQL DECLARE csr001 CURSOR FOR stmt;
EXEC SQL OPEN csr001;
rowcount = 0;
return ((rowcount == 0) ? MR_NO_MATCH : MR_SUCCESS);
}
+char *sqlstrstr(str,pat)
+ char *str;
+ char *pat;
+{
+ register char *p=pat;
+
+ do {
+ if(*str=='\'') { /* Skip over single-quote delimited substrings */
+ while(*++str && (*str!='\''))
+ ;
+ continue;
+ }
+ if(*str==*p) {
+ register char *s;
+ s=str;
+ while(*++p && (*++s==*p))
+ ;
+ if(*p) p=pat; /* failed */
+ }
+ } while(*p && *++str);
+
+ if(!*str) str=NULL;
+ return(str);
+}
+
+void optimize_sql_stmt(buf)
+char *buf;
+{
+ char *point=buf, *pat, *eopat, *esc1, *esc2, *csr;
+
+ for(point=buf; point=sqlstrstr(point,"LIKE"); point++) {
+ /* Now pointing to string "LIKE" */
+
+ /* Look at next word */
+ for(pat=point+4; *pat==' '; pat++) ;
+
+ /* Is it a single-quote delimited string? */
+ if(*pat!='\'') continue;
+
+ /* look for "escape" clause - save escape character */
+ /* 1. Find end of pattern */
+ for(eopat=pat+1; 1; eopat++) {
+ if(*eopat=='\'') {
+ if(eopat[1]=='\'') /* single-quote is self-escaping */
+ eopat++;
+ else
+ break;
+ }
+ }
+
+ /* 2. Look at next word */
+ for(esc1=eopat; *++esc1==' ';) ;
+
+ /* 3. esc1=0 if not "ESCAPE '?'", where the ? may be any character. */
+ if(strncmp(esc1,"ESCAPE",6)) esc1=NULL;
+
+ if(esc1) {
+ for(esc2=esc1+6; *esc2==' '; esc2++) ;
+
+ if(*esc2++!='\'') continue; /* Bad SQL syntax. Skip. */
+ /* esc2 now points at the escape character itself */
+ if(esc2[1]!='\'') continue; /* Weird escape string. Skip. */
+ } else {
+ esc2="\\";
+ }
+
+ /* Is pattern free from special characters? */
+ for(csr=pat; csr<eopat; csr++)
+ if((*csr=='%') || (*csr=='_') || (*csr==*esc2)) break;
+ if(csr!=eopat) continue; /* Uses pattern matching. Skip. */
+
+ /* Optimize the query statement */
+ /* 1. Change "LIKE" to " = " */
+ memcpy(point," = ",4);
+
+ /* 2. Change "ESCAPE" to " " */
+ if(esc1) {
+ memset(esc1,' ',6);
+ /* 3. Change "'*'" to " " */
+ /* (Changes '''' to " ") */
+ if(esc2) memset(esc2-1,' ',(*esc2=='\'')?4:3);
+ }
+ }
+}
+
build_sql_stmt(result_buf,cmd,targetlist,argv,qual)
char *result_buf;
char *cmd;
char *qual;
{
char fmt_buf[MR_STMTBUF_LEN];
- char tmp_buf[16];
- register char *res=result_buf, *tmp=tmp_buf, *fmt=fmt_buf;
- register int state;
-
- sprintf(fmt_buf,"%s %s",cmd,targetlist);
- if(qual) { strcat(fmt_buf," WHERE "); strcat(fmt_buf,qual); }
-
- for(state=0;*fmt != '\0';fmt++) {
- switch(state) {
- case 0:
- if(*fmt=='%') { /* formatting -> tmp */
- *tmp++ = *fmt;
- state=1;
- } else *res++ = *fmt; /* text -> res */
- break;
- case 1:
- if((*fmt=='%') && (tmp==tmp_buf+1)) { /* %% -> % */
- *res++ = *fmt;
- tmp=tmp_buf;
- state=0;
- } else if(isalpha(*fmt) && (*fmt!='h') && (*fmt!='l')) { /* end of formatting */
- *tmp++ = *fmt;
- *tmp='\0';
- tmp=tmp_buf;
- sprintf(res,tmp_buf,*argv++); /* print to result buffer */
- while(*++res) ;
- state=0;
- } else *tmp++ = *fmt; /* keep copying the formatting to tmp */
- break;
- }
+ register char *res, *fmt;
+
+ if(qual)
+ sprintf(fmt_buf,"%s %s WHERE %s",cmd,targetlist,qual);
+ else
+ sprintf(fmt_buf,"%s %s",cmd,targetlist);
+
+ for(res=result_buf, fmt=fmt_buf; *fmt; fmt++) {
+ if(*fmt=='%') {
+ if(*++fmt) {
+ switch(*fmt) {
+ case '%': /* %% -> % */
+ *res++ = *fmt;
+ break;
+ case 's':
+ if(*argv[0]) {
+ *res='\0';
+ strcat(res,*argv);
+ while(*++res) ;
+ }
+ argv++;
+ break;
+ case 'd':
+ sprintf(res,"%d",*(int *)*argv++); /* print to result buffer */
+ while(*++res) ;
+ break;
+ default: /* Swallow other %? pairs */
+ break;
+ }
+ } else break;
+ } else *res++ = *fmt; /* text -> result buffer */
}
*res='\0';
+
+ optimize_sql_stmt(result_buf);
}
do_update(q, argv, qual, action, actarg)
sprintf(stmt_buf,"SELECT %s FROM %s WHERE %s=%d",object,table_name,object,value);
EXEC SQL PREPARE stmt INTO :SQLDA USING NAMES FROM :stmt_buf;
+ if(sqlca.sqlcode)
+ return(MR_INTERNAL);
EXEC SQL DECLARE csr002 CURSOR FOR stmt;
EXEC SQL OPEN csr002;
EXEC SQL FETCH csr002 USING DESCRIPTOR :SQLDA;
*kid = 0;
*uid = 0;
- EXEC SQL SELECT k.users_id, k.string_id INTO :u_id, :k_id
- FROM krbmap k, strings s
- WHERE k.string_id = s.string_id AND s.string = :krbname;
+ EXEC SQL SELECT km.users_id, km.string_id INTO :u_id, :k_id
+ FROM krbmap km, strings str
+ WHERE km.string_id = str.string_id AND str.string = :krbname;
+ EXEC SQL COMMIT WORK;
if (ingres_errno) return(mr_errcode);
andersk / moira.git / blobdiff