From a8f913b63b826689db76a29e5b9a074e6e7b7d93 Mon Sep 17 00:00:00 2001 From: lsv Date: Wed, 2 Dec 2020 20:22:31 +0500 Subject: [PATCH] Fix SERVER_MAX_VERSION_N and fix other bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Повышена максимально допустимая версия. При выгрузке в Sql разделитель полей исправлен на запятую. --- ctl/ctlSQLGrid.cpp | 2 +- include/pgAdmin3.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctl/ctlSQLGrid.cpp b/ctl/ctlSQLGrid.cpp index ac49ece..fae2513 100644 --- a/ctl/ctlSQLGrid.cpp +++ b/ctl/ctlSQLGrid.cpp @@ -217,7 +217,7 @@ wxString ctlSQLGrid::GetExportLine(int row, wxArrayInt cols) if (GetNumberCols() == 0 || GetRowSize(row)==0) return str; wxString colsep=settings->GetCopyColSeparator(); - if (generatesql == 2) colsep=wxT(","); + if (generatesql == 2|| generatesql == 1) colsep=wxT(","); if (generatesql == 3) colsep = wxT(" and "); wxString qtsimbol=settings->GetCopyQuoteChar(); if (generatesql>0) qtsimbol=wxT("'"); diff --git a/include/pgAdmin3.h b/include/pgAdmin3.h index 8b28e7c..dc27d82 100644 --- a/include/pgAdmin3.h +++ b/include/pgAdmin3.h @@ -60,8 +60,8 @@ // Supported server minimum and maximum values. const short SERVER_MIN_VERSION_N = 0x0804; const wxString SERVER_MIN_VERSION_T = wxT("8.4"); -const short SERVER_MAX_VERSION_N = 0x0D00; -const wxString SERVER_MAX_VERSION_T = wxT("13"); +const short SERVER_MAX_VERSION_N = 0x0E00; +const wxString SERVER_MAX_VERSION_T = wxT("14"); // Supported Greenplum Database and Greenplum HAWQ minimum and maximum values. const short GP_MIN_VERSION_N = 0x0802; const wxString GP_MIN_VERSION_T = wxT("8.2");