New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2017.02 #60

Merged
merged 30 commits into from Feb 8, 2017
Commits
Jump to file or symbol
Failed to load files and symbols.
+27 鈭4
Diff settings

Always

Just for now

@@ -1387,7 +1387,7 @@ public static String getOrdinalFromCardinalNumber(int number) {
* @return
*/
public static String escapeQuotes(String value) {
if (value == null) {
if (value == null || "NULL".equals(value)) {
return value;
}
data.setLength(0);
@@ -1426,4 +1426,22 @@ private static void replaceQuotes(char quote) {
private static void wrapQuotesAndAppendToData(char quote) {
data.insert(0, quote).insert(data.length(), quote);
}
public static String getWrappedQuote(String value) {
if (value != null) {
if (value.startsWith("'") && value.endsWith("'")) {
return "'";
}
if (value.startsWith("\"") && value.endsWith("\"")) {
return "\"";
}
}
return "";
}
public static String insertQuotes(String quote, String data) {
data = data.substring(1, data.length() - 1);
data = quote + data + quote;
return "'" + data + "'";
}
}
@@ -1464,11 +1464,16 @@ private String getFormatedValue(ColumnInfo colInfo, String data) {
if ("(NULL)".equals(data)) {
return nullValue;
} else {
String quote = StringUtil.getWrappedQuote(data);
try {
FormatDataResult formatResult = DBAttrTypeFormatter.formatForInput(
colInfo.getComleteType(), data, true, charset, false);
if (formatResult.isSuccess()
&& formatResult.getFormatedString() != null) {
if (!quote.equals("")) {
formatResult.setFormatedString(StringUtil.insertQuotes(
quote, formatResult.getFormatedString()));
}
return formatResult.getFormatedString();
}
} catch (Exception ex) {
@@ -190,8 +190,8 @@ tipBrokerAccessModeNotWorking=Unknown
lblFromFile=File:
lblBrowser=Browse
msgImportServer=You can import hosts from XML file which can be exported by going to [File] > [Export Hosts].
msgExportServer=You can export hosts to XML file. After the export is finished, you can import Hosts by going to [File] > [Import Hosts]. No password is included.
msgImportServer=Import hosts from XML file.
msgExportServer=Export hosts to XML file. Note: The passwords are not included.
msgErrorMissingImportFile=Please select the import file.
msgErrorMissingImportServer=Please select the import hosts.
msgErrorMissingExportFile=Please select export file.
@@ -1,4 +1,4 @@
productName=CUBRID Manager
releaseStr=9.3.6
releaseVersion=9.3.6
buildVersionId=9.3.6.006
buildVersionId=9.3.6.007
ProTip! Use n and p to navigate between commits in a pull request.