Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
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
Container registry
Model registry
Operate
Environments
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
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
86234a09
Commit
86234a09
authored
26 years ago
by
Thomas G. Lockhart
Browse files
Options
Downloads
Patches
Plain Diff
Fix up warning and error messages to use single-quotes around strings.
parent
60ed8bbe
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/backend/commands/dbcommands.c
+13
-13
13 additions, 13 deletions
src/backend/commands/dbcommands.c
with
13 additions
and
13 deletions
src/backend/commands/dbcommands.c
+
13
−
13
View file @
86234a09
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.2
4
1998/0
9
/0
1
0
4:27:51 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.2
5
1998/
1
0/0
5
0
2:49:36 thomas
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -77,7 +77,7 @@ createdb(char *dbname, char *dbpath, int encoding)
" in the server"
,
loc
);
if
(
mkdir
(
lp
,
S_IRWXU
)
!=
0
)
elog
(
ERROR
,
"Unable to create database directory %s"
,
lp
);
elog
(
ERROR
,
"Unable to create database directory
'
%s
'
"
,
lp
);
sprintf
(
buf
,
"%s %s%cbase%ctemplate1%c* %s"
,
COPY_CMD
,
DataDir
,
SEP_CHAR
,
SEP_CHAR
,
SEP_CHAR
,
lp
);
...
...
@@ -85,12 +85,12 @@ createdb(char *dbname, char *dbpath, int encoding)
#if FALSE
sprintf
(
buf
,
"insert into pg_database (datname, datdba, datpath) \
values (
\
'
%s
\
'
::name,
\
'
%d
\
'
::oid,
\
'
%s
\
'
::text);"
,
values ('%s'::name, '%d'::oid, '%s'::text);"
,
dbname
,
user_id
,
dbname
);
#endif
sprintf
(
buf
,
"insert into pg_database (datname, datdba, encoding, datpath)"
" values (
\
'
%s
\
'
,
\
'
%d
\
'
,
\
'
%d
\
'
,
\
'
%s
\
'
);"
,
dbname
,
user_id
,
encoding
,
loc
);
" values ('%s', '%d', '%d', '%s');"
,
dbname
,
user_id
,
encoding
,
loc
);
pg_exec_query
(
buf
);
...
...
@@ -112,7 +112,7 @@ destroydb(char *dbname)
check_permissions
(
"destroydb"
,
dbpath
,
dbname
,
&
db_id
,
&
user_id
);
if
(
!
OidIsValid
(
db_id
))
elog
(
FATAL
,
"
impossible:
pg_database instance
with
invalid OID
.
"
);
elog
(
FATAL
,
"pg_database instance
has an
invalid OID"
);
/* stop the vacuum daemon */
stop_vacuum
(
dbpath
,
dbname
);
...
...
@@ -156,7 +156,7 @@ get_pg_dbtup(char *command, char *dbname, Relation dbrel)
scan
=
heap_beginscan
(
dbrel
,
0
,
SnapshotNow
,
1
,
&
scanKey
);
if
(
!
HeapScanIsValid
(
scan
))
elog
(
ERROR
,
"%s: cannot begin scan of pg_database
.
"
,
command
);
elog
(
ERROR
,
"%s: cannot begin scan of pg_database"
,
command
);
/*
* since we want to return the tuple out of this proc, and we're going
...
...
@@ -211,17 +211,17 @@ check_permissions(char *command,
/* Check to make sure user has permission to use createdb */
if
(
!
use_createdb
)
{
elog
(
ERROR
,
"user
\"
%s
\"
is not allowed to create/destroy databases"
,
elog
(
ERROR
,
"user
'%s'
is not allowed to create/destroy databases"
,
userName
);
}
/* Make sure we are not mucking with the template database */
if
(
!
strcmp
(
dbname
,
"template1"
))
elog
(
ERROR
,
"%s cannot be executed on the template database
.
"
,
command
);
elog
(
ERROR
,
"%s
:
cannot be executed on the template database"
,
command
);
/* Check to make sure database is not the currently open database */
if
(
!
strcmp
(
dbname
,
DatabaseName
))
elog
(
ERROR
,
"%s cannot be executed on an open database"
,
command
);
elog
(
ERROR
,
"%s
:
cannot be executed on an open database"
,
command
);
/* Check to make sure database is owned by this user */
...
...
@@ -272,20 +272,20 @@ check_permissions(char *command,
if
(
dbfound
&&
!
strcmp
(
command
,
"createdb"
))
{
elog
(
ERROR
,
"createdb: database %s already exists
.
"
,
dbname
);
elog
(
ERROR
,
"createdb: database
'
%s
'
already exists"
,
dbname
);
}
else
if
(
!
dbfound
&&
!
strcmp
(
command
,
"destroydb"
))
{
elog
(
ERROR
,
"destroydb: database %s does not exist
.
"
,
dbname
);
elog
(
ERROR
,
"destroydb: database
'
%s
'
does not exist"
,
dbname
);
}
else
if
(
dbfound
&&
!
strcmp
(
command
,
"destroydb"
)
&&
dbowner
!=
*
userIdP
&&
use_super
==
false
)
{
elog
(
ERROR
,
"%s: database %s is not owned by you
.
"
,
command
,
dbname
);
elog
(
ERROR
,
"%s: database
'
%s
'
is not owned by you"
,
command
,
dbname
);
}
...
...
@@ -317,7 +317,7 @@ stop_vacuum(char *dbpath, char *dbname)
FreeFile
(
fp
);
if
(
kill
(
pid
,
SIGKILLDAEMON1
)
<
0
)
{
elog
(
ERROR
,
"can't kill vacuum daemon (pid %d) on %s"
,
elog
(
ERROR
,
"can't kill vacuum daemon (pid %d) on
'
%s
'
"
,
pid
,
dbname
);
}
}
...
...
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