Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
edc4d1a8
Commit
edc4d1a8
authored
11 years ago
by
Fons Rademakers
Browse files
Options
Downloads
Patches
Plain Diff
comment out new code that depends on server side includes. Needs fixing.
parent
8b74c1e3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sql/pgsql/inc/TPgSQLServer.h
+3
-3
3 additions, 3 deletions
sql/pgsql/inc/TPgSQLServer.h
sql/pgsql/src/TPgSQLServer.cxx
+2
-9
2 additions, 9 deletions
sql/pgsql/src/TPgSQLServer.cxx
with
5 additions
and
12 deletions
sql/pgsql/inc/TPgSQLServer.h
+
3
−
3
View file @
edc4d1a8
...
...
@@ -17,9 +17,9 @@
#endif
#if !defined(__CINT__)
#include
<postgres.h>
//
#include <postgres.h>
#include
<libpq-fe.h>
#include
<catalog/pg_type.h>
//
#include <catalog/pg_type.h>
#else
struct
PGconn
;
#endif
...
...
@@ -44,7 +44,7 @@ public:
TSQLResult
*
GetDataBases
(
const
char
*
wild
=
0
);
TSQLResult
*
GetTables
(
const
char
*
dbname
,
const
char
*
wild
=
0
);
TSQLResult
*
GetColumns
(
const
char
*
dbname
,
const
char
*
table
,
const
char
*
wild
=
0
);
TSQLTableInfo
*
GetTableInfo
(
const
char
*
tablename
);
//
TSQLTableInfo *GetTableInfo(const char *tablename);
Int_t
CreateDataBase
(
const
char
*
dbname
);
Int_t
DropDataBase
(
const
char
*
dbname
);
Int_t
Reload
();
...
...
This diff is collapsed.
Click to expand it.
sql/pgsql/src/TPgSQLServer.cxx
+
2
−
9
View file @
edc4d1a8
...
...
@@ -22,10 +22,6 @@
#include
"TObjArray.h"
#include
<iostream>
using
namespace
std
;
ClassImp
(
TPgSQLServer
)
//______________________________________________________________________________
...
...
@@ -122,7 +118,6 @@ TSQLResult *TPgSQLServer::Query(const char *sql)
}
PGresult
*
res
=
PQexec
(
fPgSQL
,
sql
);
//cout << " Query called " << sql << ":" << PQntuples(res) << endl;
if
((
PQresultStatus
(
res
)
!=
PGRES_COMMAND_OK
)
&&
(
PQresultStatus
(
res
)
!=
PGRES_TUPLES_OK
))
{
...
...
@@ -382,6 +377,7 @@ TSQLStatement* TPgSQLServer::Statement(const char *, Int_t)
return
0
;
}
#if 0
//______________________________________________________________________________
TSQLTableInfo *TPgSQLServer::GetTableInfo(const char *tablename)
{
...
...
@@ -509,10 +505,6 @@ TSQLTableInfo *TPgSQLServer::GetTableInfo(const char *tablename)
break;
}
//cout << " -I- ibin# " << ibin << "col# " << col << " cname: "
// << column_name << " sqltype:" << sqltype << " imod: "
// << imod << " isize:" << isize << endl;
if (!lst)
lst = new TList;
lst->Add(new TSQLColumnInfo(column_name,
...
...
@@ -528,3 +520,4 @@ TSQLTableInfo *TPgSQLServer::GetTableInfo(const char *tablename)
PQclear(res);
return (new TSQLTableInfo(tablename, lst));
}
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment