Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
286bb240
Commit
286bb240
authored
May 09, 2018
by
Andrew Dunstan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perltidy some recent code changes before changing perltidy settings
parent
d1e2cac5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
23 deletions
+28
-23
src/backend/catalog/Catalog.pm
src/backend/catalog/Catalog.pm
+1
-1
src/tools/msvc/Install.pm
src/tools/msvc/Install.pm
+5
-5
src/tools/msvc/vcregress.pl
src/tools/msvc/vcregress.pl
+22
-17
No files found.
src/backend/catalog/Catalog.pm
View file @
286bb240
...
...
@@ -253,7 +253,7 @@ sub ParseData
# We're treating the input line as a piece of Perl, so we
# need to use string eval here. Tell perlcritic we know what
# we're doing.
eval
'
$hash_ref =
'
.
$_
;
## no critic (ProhibitStringyEval)
eval
'
$hash_ref =
'
.
$_
;
## no critic (ProhibitStringyEval)
if
(
!
ref
$hash_ref
)
{
die
"
$input_file
: error parsing line $.:
\n
$_
\n
";
...
...
src/tools/msvc/Install.pm
View file @
286bb240
...
...
@@ -462,11 +462,11 @@ sub CopyContribFiles
while (my
$d
= readdir(
$D
))
{
# These configuration-based exclusions must match vcregress.pl
next if (
$d
eq
"
uuid
-
ossp
"
&& !defined(
$config
->{uuid}));
next if (
$d
eq
"
sslinfo
"
&& !defined(
$config
->{openssl}));
next if (
$d
eq
"
xml2
"
&& !defined(
$config
->{xml}));
next if (
$d
=~ /_plperl$/
&& !defined(
$config
->{perl}));
next if (
$d
=~ /_plpython$/
&& !defined(
$config
->{python}));
next if (
$d
eq
"
uuid
-
ossp
"
&& !defined(
$config
->{uuid}));
next if (
$d
eq
"
sslinfo
"
&& !defined(
$config
->{openssl}));
next if (
$d
eq
"
xml2
"
&& !defined(
$config
->{xml}));
next if (
$d
=~ /_plperl$/ && !defined(
$config
->{perl}));
next if (
$d
=~ /_plpython$/ && !defined(
$config
->{python}));
next if (
$d
eq
"
sepgsql
"
);
CopySubdirFiles(
$subdir
,
$d
,
$config
,
$target
);
...
...
src/tools/msvc/vcregress.pl
View file @
286bb240
...
...
@@ -257,14 +257,16 @@ sub mangle_plpython3
foreach
my
$test
(
@$tests
)
{
local
$/
=
undef
;
foreach
my
$dir
('
sql
','
expected
')
foreach
my
$dir
('
sql
',
'
expected
')
{
my
$extension
=
(
$dir
eq
'
sql
'
?
'
sql
'
:
'
out
');
my
@files
=
glob
("
$dir
/
$test
.
$extension
$dir
/
${test}
_[0-9].
$extension
");
my
@files
=
glob
("
$dir
/
$test
.
$extension
$dir
/
${test}
_[0-9].
$extension
");
foreach
my
$file
(
@files
)
{
open
(
my
$handle
,
'
<
',
$file
)
||
die
"
test file
$file
not found
";
open
(
my
$handle
,
'
<
',
$file
)
||
die
"
test file
$file
not found
";
my
$contents
=
<
$handle
>
;
close
(
$handle
);
do
...
...
@@ -279,16 +281,18 @@ sub mangle_plpython3
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g
;
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g
;
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g
;
}
for
(
$contents
);
}
for
(
$contents
);
my
$base
=
basename
$file
;
open
(
$handle
,
'
>
',
"
$dir
/python3/
$base
")
||
die
"
opening python 3 file for
$file
";
open
(
$handle
,
'
>
',
"
$dir
/python3/
$base
")
||
die
"
opening python 3 file for
$file
";
print
$handle
$contents
;
close
(
$handle
);
}
}
}
do
{
s!^!python3/!
;
}
foreach
(
@$tests
);
do
{
s!^!python3/!
;
}
foreach
(
@$tests
);
return
@$tests
;
}
...
...
@@ -314,8 +318,9 @@ sub plcheck
}
if
(
$lang
eq
'
plpython
')
{
next
unless
-
d
"
$topdir
/
$Config
/plpython2
"
||
-
d
"
$topdir
/
$Config
/plpython3
";
next
unless
-
d
"
$topdir
/
$Config
/plpython2
"
||
-
d
"
$topdir
/
$Config
/plpython3
";
$lang
=
'
plpythonu
';
}
else
...
...
@@ -326,7 +331,7 @@ sub plcheck
chdir
$dir
;
my
@tests
=
fetchTests
();
@tests
=
mangle_plpython3
(
\
@tests
)
if
$lang
eq
'
plpythonu
'
&&
-
d
"
$topdir
/
$Config
/plpython3
";
if
$lang
eq
'
plpythonu
'
&&
-
d
"
$topdir
/
$Config
/plpython3
";
if
(
$lang
eq
'
plperl
')
{
...
...
@@ -380,7 +385,7 @@ sub subdircheck
# Special processing for python transform modules, see their respective
# Makefiles for more details regarding Python-version specific
# dependencies.
if
(
$module
=~
/_plpython$/
)
if
(
$module
=~
/_plpython$/
)
{
die
"
Python not enabled in configuration
"
if
!
defined
(
$config
->
{
python
});
...
...
@@ -405,7 +410,7 @@ sub subdircheck
"
$topdir
/
$Config
/pg_regress/pg_regress
",
"
--bindir=
${topdir}
/
${Config}
/psql
",
"
--dbname=contrib_regression
",
@opts
,
@tests
);
print
join
('
',
@args
),
"
\n
";
print
join
('
',
@args
),
"
\n
";
system
(
@args
);
chdir
"
..
";
}
...
...
@@ -417,11 +422,11 @@ sub contribcheck
foreach
my
$module
(
glob
("
*
"))
{
# these configuration-based exclusions must match Install.pm
next
if
(
$module
eq
"
uuid-ossp
"
&&
!
defined
(
$config
->
{
uuid
}));
next
if
(
$module
eq
"
sslinfo
"
&&
!
defined
(
$config
->
{
openssl
}));
next
if
(
$module
eq
"
xml2
"
&&
!
defined
(
$config
->
{
xml
}));
next
if
(
$module
=~
/_plperl$/
&&
!
defined
(
$config
->
{
perl
}));
next
if
(
$module
=~
/_plpython$/
&&
!
defined
(
$config
->
{
python
}));
next
if
(
$module
eq
"
uuid-ossp
"
&&
!
defined
(
$config
->
{
uuid
}));
next
if
(
$module
eq
"
sslinfo
"
&&
!
defined
(
$config
->
{
openssl
}));
next
if
(
$module
eq
"
xml2
"
&&
!
defined
(
$config
->
{
xml
}));
next
if
(
$module
=~
/_plperl$/
&&
!
defined
(
$config
->
{
perl
}));
next
if
(
$module
=~
/_plpython$/
&&
!
defined
(
$config
->
{
python
}));
next
if
(
$module
eq
"
sepgsql
");
subdircheck
(
$module
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment