Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting to 1.30

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2000-02-24 00:43:40 +00:00
parent ea5d599df3
commit e16143f6c7
1 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/dbtable.cpp
View File

@@ -130,8 +130,6 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
wxStrcpy(tableName, tblName); // Table Name wxStrcpy(tableName, tblName); // Table Name
if (tblPath) if (tblPath)
wxStrcpy(tablePath, tblPath); // Table Path - used for dBase files wxStrcpy(tablePath, tblPath); // Table Path - used for dBase files
else
tablePath[0]=0;
if (qryTblName) // Name of the table/view to query if (qryTblName) // Name of the table/view to query
wxStrcpy(queryTableName, qryTblName); wxStrcpy(queryTableName, qryTblName);
@@ -580,43 +578,20 @@ bool wxTable::Open(void)
int i; int i;
// char sqlStmt[DB_MAX_STATEMENT_LEN]; // char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt; wxString sqlStmt;
wxString *s = NULL;
// Verify that the table exists in the database // Verify that the table exists in the database
// if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath)) if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath))
if (!pDb->TableExists(tableName,NULL,tablePath))
{ {
s =new wxString("Table/view does not exist in the database"); wxString s;
if (*(pDb->dbInf.accessibleTables) == 'Y')
{
(*s)+=", or you have insufficient permissions.\n";
}
else
{
(*s)+=".\n";
}
}
else
{
// Verify the user has rights to access the table.
// Shortcut boolean evaluation to optimize out call to TablePrivs
// Unfortunely this optimization doesn't seem to be reliable!
if (/* *(pDb->dbInf.accessibleTables) == 'N' && */
!pDb->TablePrivileges(tableName,"SELECT",NULL,tablePath))
s = new wxString("Current logged in user has insufficient privileges to access this table.\n");
}
if (s)
{
wxString p;
if (wxStrcmp(tablePath,"")) if (wxStrcmp(tablePath,""))
p.sprintf("Error opening '%s/%s'.\n",tablePath,tableName); s.sprintf("Error opening '%s/%s'.\n",tablePath,tableName);
else else
p.sprintf("Error opening '%s'.\n", tableName); s.sprintf("Error opening '%s'.\n", tableName);
if (!pDb->TableExists(tableName,NULL,tablePath))
p += (*s); s += "Table/view does not exist in the database.\n";
pDb->LogError(p.GetData()); else
s += "Current logged in user does not have sufficient privileges to access this table.\n";
pDb->LogError(s.GetData());
return(FALSE); return(FALSE);
} }