comparison src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java @ 335:92cb2fae5df8

Backed out changeset aa17dfa45a8a
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Wed, 25 Sep 2019 15:06:56 +0200 (2019-09-25)
parents aa17dfa45a8a
children 5826913bdc6d
comparison
equal deleted inserted replaced
334:aa17dfa45a8a 335:92cb2fae5df8
119 119
120 /** The number of results we receive from the server at once */ 120 /** The number of results we receive from the server at once */
121 private int curReplySize = -1; // the server by default uses -1 (all) 121 private int curReplySize = -1; // the server by default uses -1 (all)
122 122
123 /** A template to apply to each query (like pre and post fixes), filled in constructor */ 123 /** A template to apply to each query (like pre and post fixes), filled in constructor */
124 // note: it is made public to the package as queryTempl[2] is used from MonetStatement 124 // note: it is made public to the package as it is used from MonetStatement
125 final String[] queryTempl = new String[3]; // pre, post, sep 125 final String[] queryTempl = new String[3]; // pre, post, sep
126 126
127 /** A template to apply to each command (like pre and post fixes), filled in constructor */ 127 /** A template to apply to each command (like pre and post fixes), filled in constructor */
128 private final String[] commandTempl = new String[2]; // pre, post 128 private final String[] commandTempl = new String[3]; // pre, post, sep
129 129
130 /** the SQL language */ 130 /** the SQL language */
131 private static final int LANG_SQL = 0; 131 private static final int LANG_SQL = 0;
132 /** the MAL language (officially *NOT* supported) */ 132 /** the MAL language (officially *NOT* supported) */
133 private static final int LANG_MAL = 3; 133 private static final int LANG_MAL = 3;
318 queryTempl[1] = "\n;"; // post 318 queryTempl[1] = "\n;"; // post
319 queryTempl[2] = "\n;\n"; // separator 319 queryTempl[2] = "\n;\n"; // separator
320 320
321 commandTempl[0] = "X"; // pre 321 commandTempl[0] = "X"; // pre
322 commandTempl[1] = ""; // post 322 commandTempl[1] = ""; // post
323 //commandTempl[2] = "\nX"; // separator 323 commandTempl[2] = "\nX"; // separator
324 } else if ("mal".equals(language)) { 324 } else if ("mal".equals(language)) {
325 lang = LANG_MAL; 325 lang = LANG_MAL;
326 326
327 queryTempl[0] = ""; // pre 327 queryTempl[0] = ""; // pre
328 queryTempl[1] = ";\n"; // post 328 queryTempl[1] = ";\n"; // post
329 queryTempl[2] = ";\n"; // separator 329 queryTempl[2] = ";\n"; // separator
330 330
331 commandTempl[0] = ""; // pre 331 commandTempl[0] = ""; // pre
332 commandTempl[1] = ""; // post 332 commandTempl[1] = ""; // post
333 //commandTempl[2] = ""; // separator 333 commandTempl[2] = ""; // separator
334 } else { 334 } else {
335 lang = LANG_UNKNOWN; 335 lang = LANG_UNKNOWN;
336 } 336 }
337 337
338 // the following initialisers are only valid when the language is SQL... 338 // the following initialisers are only valid when the language is SQL...