Changeset: 17107727052d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17107727052d
Modified Files:
Branch: default
Log Message:
merging heads
diffs (53 lines):
diff -r aa33fcf66f4f -r 17107727052d clients/ChangeLog
--- a/clients/ChangeLog Wed Jul 21 12:55:23 2010 +0200
+++ b/clients/ChangeLog Wed Jul 21 12:56:20 2010 +0200
@@ -1,6 +1,14 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Jul 21 2010 Fabian Groffen <fab...@cwi.nl>
+- In SQL mode, always use the table formatter, as there is no sense to
+ use raw (protocol debug) mode when reading from pipe or file really.
+ People likely prefer tab (-ftab) formatting in such case for easy
+ scripting.
+
* Thu Jul 15 2010 Fabian Groffen <fab...@cwi.nl>
-- In SQL (rendering) mode, mclient now returns timings for SELECT and
UPDATE/INSERT/DELETE queries next to the number of tuples returned or rows
affected.
+- In SQL (rendering) mode, mclient now returns timings for SELECT and
+ UPDATE/INSERT/DELETE queries next to the number of tuples returned or
+ rows affected.
diff -r aa33fcf66f4f -r 17107727052d clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jul 21 12:55:23 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jul 21 12:56:20 2010 +0200
@@ -2533,22 +2533,19 @@
mapi_setAlgebra(mid, algebra);
mapi_profile(mid, mark != NULL);
mapi_trace(mid, trace);
- if (output)
+ if (output) {
setFormatter(mid, output);
+ } else {
+ if (mode == SQL) {
+ setFormatter(mid, "sql");
+ } else {
+ setFormatter(mid, "raw");
+ }
+ }
c = 0;
has_fileargs = optind != argc;
- /* default formatter depends on whether we're interactive */
- if (formatter == NOformatter) {
- if ((interactive || (!has_fileargs && command == NULL)) &&
- interactive_stdin && mode != XQUERY && mode != MAL) {
- formatter = TABLEformatter;
- } else {
- formatter = RAWformatter;
- }
- }
-
if (input != NULL && mode == XQUERY) {
/* stream xml document into the server */
MapiMsg rc;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
