tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-25 23:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sql: sqlplus is sqlplus64 on AMD64.

Browse source
This commit is contained in:
Ole Tange 2016-08-02 01:30:46 +02:00
parent cd9b2a4c24
commit a1757c141a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sql
View file

@ -205,7 +205,7 @@ postgres), PostgreSQL with SSL (postgresqlssl, pgs, pgsqlssl,
postgresssl, pgssl, postgresqls, pgsqls, postgress), SQLite2 (sqlite, postgresssl, pgssl, postgresqls, pgsqls, postgress), SQLite2 (sqlite,
sqlite2), SQLite3 (sqlite3). sqlite2), SQLite3 (sqlite3).
Aliases must start with ':' and are read from Aliases must start with ':' and are read from
/etc/sql/aliases and ~/.sql/aliases. The user's own /etc/sql/aliases and ~/.sql/aliases. The user's own
~/.sql/aliases should only be readable by the user. ~/.sql/aliases should only be readable by the user.
@ -566,7 +566,7 @@ $Global::Initfile && unlink $Global::Initfile;
exit ($err); exit ($err);
sub parse_options { sub parse_options {
$Global::version = 20160722; $Global::version = 20160724;
$Global::progname = 'sql'; $Global::progname = 'sql';
# This must be done first as this may exec myself # This must be done first as this may exec myself
@ -689,7 +689,9 @@ sub oracle_commands {
my ($database_driver,%opt) = (@_); my ($database_driver,%opt) = (@_);
# oracle://user:pass@grum:1521/XE becomes: # oracle://user:pass@grum:1521/XE becomes:
# sqlplus 'user/pass@(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = grum)(PORT = 1521)) (CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = XE) ))' # sqlplus 'user/pass@(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = grum)(PORT = 1521)) (CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = XE) ))'
find_command_in_path("sqlplus") || die ("sqlplus not in path"); my $sqlplus = find_command_in_path("sqlplus") ||
find_command_in_path("sqlplus64") or
die ("sqlplus/sqlplus64 not in path");
# Readline support: if rlwrap installed run rlwrap sqlplus # Readline support: if rlwrap installed run rlwrap sqlplus
my $rlwrap = find_command_in_path("rlwrap"); my $rlwrap = find_command_in_path("rlwrap");
@ -729,8 +731,8 @@ sub oracle_commands {
my $ssl = ""; my $ssl = "";
# -L: Do not re-ask for password if it is wrong # -L: Do not re-ask for password if it is wrong
my $common_options = "-L $pass_through_options '$user$password\@$tns' \@$Global::Initfile"; my $common_options = "-L $pass_through_options '$user$password\@$tns' \@$Global::Initfile";
my $batch_command = "sqlplus -S ".$common_options; my $batch_command = "$sqlplus -S ".$common_options;
my $interactive_command = "$rlwrap sqlplus ".$common_options; my $interactive_command = "$rlwrap $sqlplus ".$common_options;
return($batch_command,$interactive_command); return($batch_command,$interactive_command);
} }
@ -974,7 +976,7 @@ sub get_alias {
sub check_permissions { sub check_permissions {
my $file = shift; my $file = shift;
if(-e $file) { if(-e $file) {
if(not -o $file) { if(not -o $file) {
my $username = (getpwuid($<))[0]; my $username = (getpwuid($<))[0];
@ -984,7 +986,7 @@ sub check_permissions {
$atime,$mtime,$ctime,$blksize,$blocks) = stat($file); $atime,$mtime,$ctime,$blksize,$blocks) = stat($file);
if($mode & 077) { if($mode & 077) {
my $username = (getpwuid($<))[0]; my $username = (getpwuid($<))[0];
print STDERR "$file should be only be readable by $username: chmod 600 $file\n"; print STDERR "$file should be only be readable by $username: chmod 600 $file\n";
} }
} }
} }