Date: Fri, 28 Aug 2020 17:36:55 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546765 - head/editors/codelite/files Message-ID: <202008281736.07SHateo096216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Aug 28 17:36:55 2020 New Revision: 546765 URL: https://svnweb.freebsd.org/changeset/ports/546765 Log: editors/codelite: fix build on recent current Added: head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp (contents, props changed) head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp (contents, props changed) head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp (contents, props changed) Added: head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/MySqlDbAdapter.cpp.orig 2020-08-28 17:23:13 UTC ++++ DatabaseExplorer/MySqlDbAdapter.cpp +@@ -210,7 +210,7 @@ bool MySqlDbAdapter::GetColumns(Table* pTab) + { + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(wxT("")); + +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("SHOW COLUMNS IN `%s`.`%s`"),pTab->GetParentName().c_str(),pTab->GetName().c_str())); Added: head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/PostgreSqlDbAdapter.cpp.orig 2020-08-28 17:27:12 UTC ++++ DatabaseExplorer/PostgreSqlDbAdapter.cpp +@@ -307,7 +307,7 @@ bool PostgreSqlDbAdapter::GetColumns(Table* pTab) { + // SetDatabase(pTab->GetParentName()); + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(pTab->GetParentName()); + +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + //DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("SHOW COLUMNS IN `%s`.`%s`"),pTab->getParentName().c_str(),pTab->getName().c_str())); Added: head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/SqliteDbAdapter.cpp.orig 2020-08-28 17:30:30 UTC ++++ DatabaseExplorer/SqliteDbAdapter.cpp +@@ -122,7 +122,7 @@ bool SQLiteDbAdapter::GetColumns(Table* pTab) { + int i = 0; + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(wxT("")); + if (dbLayer) { +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("PRAGMA table_info('%s')"),pTab->GetName().c_str()));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008281736.07SHateo096216>