Firebird

Build Version :  T2.0.0.12519 Firebird 2.0 Release Candidate 1

(writeBuildNum.sh,v 1.12673 2006/03/28 04:31:36 mkubecek Ex )

Update of /cvsroot/firebird/firebird2/src/msgs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22300/src/msgs

Modified Files:
	messages.sql facilities.sql history.sql 
Log Message:
Fix of isql command line parser: check for repeated switches or database name.

Index: messages.sql
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/msgs/messages.sql,v
retrieving revision 1.67
retrieving revision 1.68
diff -b -U3 -r1.67 -r1.68
--- messages.sql	25 Mar 2006 23:41:36 -0000	1.67
+++ messages.sql	28 Mar 2006 04:31:35 -0000	1.68
@@ -3026,8 +3026,10 @@
 INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_USER', 'ISQL_main', 'isql.epp', NULL, 17, 139, NULL, '	-u(ser) <user>          user name', NULL, NULL);
 INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_XTRACT', 'ISQL_main', 'isql.epp', NULL, 17, 140, NULL, '	-x                      extract metadata', NULL, NULL);
 INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_VERSION', 'ISQL_main', 'isql.epp', NULL, 17, 141, NULL, '	-z                      show program and server version', NULL, NULL);
-INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_NOARG', 'ISQL_main', 'isql.epp', NULL, 17, 142, NULL, 'missing argument of switch "%s"', NULL, NULL);
-INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_NOTINT', 'ISQL_main', 'isql.epp', NULL, 17, 143, NULL, 'argument "%s" is not an integer', NULL, NULL);
-INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_RANGE', 'ISQL_main', 'isql.epp', NULL, 17, 144, NULL, 'value "%s" is out of range', NULL, NULL);
+INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_NOARG', 'ISQL_main', 'isql.epp', NULL, 17, 142, NULL, 'missing argument for switch "%s"', NULL, NULL);
+INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_NOTINT', 'ISQL_main', 'isql.epp', NULL, 17, 143, NULL, 'argument "%s" for switch "%s" is not an integer', NULL, NULL);
+INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_RANGE', 'ISQL_main', 'isql.epp', NULL, 17, 144, NULL, 'value "%s" for switch "%s" is out of range', NULL, NULL);
+INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_DUPSW', 'ISQL_main', 'isql.epp', NULL, 17, 145, NULL, 'switch "%s" or its equivalent used more than once', NULL, NULL);
+INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('USAGE_DUPDB', 'ISQL_main', 'isql.epp', NULL, 17, 146, NULL, 'more than one database name: "%s", "%s"', NULL, NULL);
 
 COMMIT WORK;

Index: facilities.sql
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/msgs/facilities.sql,v
retrieving revision 1.54
retrieving revision 1.55
diff -b -U3 -r1.54 -r1.55
--- facilities.sql	25 Mar 2006 23:41:36 -0000	1.54
+++ facilities.sql	28 Mar 2006 04:31:35 -0000	1.55
@@ -22,7 +22,7 @@
 /*
 INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:43', 'GJRN', 16, 241);
 */
-INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-03-26 00:31:22', 'ISQL', 17, 145);
+INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2006-03-26 21:42:44', 'ISQL', 17, 147);
 INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1998-11-04 11:06:15', 'GSEC', 18, 91);
 INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2002-03-05 02:30:12', 'LICENSE', 19, 60);
 INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2002-03-05 02:31:54', 'DOS', 20, 74);

Index: history.sql
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/msgs/history.sql,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -U3 -r1.31 -r1.32
--- history.sql	26 Mar 2006 04:58:01 -0000	1.31
+++ history.sql	28 Mar 2006 04:31:35 -0000	1.32
@@ -1167,6 +1167,9 @@
 INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1164, 'mkubecek', '2006-03-24 01:20:04', 17, 134, '	-q                      do not show the welcome message "Use CONNECT..."', NULL, NULL, 'c_pg');
 INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1165, 'mkubecek', '2006-03-24 01:23:37', 17, 138, '	-t <terminator>         command terminator (set term)', NULL, NULL, 'c_pg');
 INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1166, 'mkubecek', '2006-03-24 01:25:21', 17, 139, '	-u <user>               user name', NULL, NULL, 'c_pg');
+INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1167, 'mkubecek', '2006-03-26 13:08:09', 17, 142, 'missing argument of switch "%s"', NULL, NULL, 'c_pg');
+INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1168, 'mkubecek', '2006-03-26 13:08:09', 17, 143, 'argument "%s" is not an integer', NULL, NULL, 'c_pg');
+INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1169, 'mkubecek', '2006-03-26 13:08:09', 17, 144, 'value "%s" is out of range', NULL, NULL, 'c_pg');
 
 COMMIT WORK;