|
4 | 4 | $db, |
5 | 5 | $privilege = undef, |
6 | 6 | $object_type = 'database', |
7 | | - $object_name = $db, |
| 7 | + $object_name = undef, |
8 | 8 | $psql_db = $postgresql::server::default_database, |
9 | 9 | $psql_user = $postgresql::server::user, |
10 | 10 | $port = $postgresql::server::port |
11 | 11 | ) { |
12 | 12 | $group = $postgresql::server::group |
13 | 13 | $psql_path = $postgresql::server::psql_path |
14 | 14 |
|
| 15 | + if ! $object_name { |
| 16 | + $_object_name = $db |
| 17 | + } else { |
| 18 | + $_object_name = $object_name |
| 19 | + } |
| 20 | + |
15 | 21 | ## Munge the input values |
16 | 22 | $_object_type = upcase($object_type) |
17 | 23 | $_privilege = upcase($privilege) |
|
93 | 99 | # object_type => 'TABLE', |
94 | 100 | # object_name => [$schema, $table], |
95 | 101 | # } |
96 | | - if is_array($object_name) { |
97 | | - $_togrant_object = join($object_name, '"."') |
| 102 | + if is_array($_object_name) { |
| 103 | + $_togrant_object = join($_object_name, '"."') |
98 | 104 | # Never put double quotes into has_*_privilege function |
99 | | - $_granted_object = join($object_name, '.') |
| 105 | + $_granted_object = join($_object_name, '.') |
100 | 106 | } else { |
101 | | - $_granted_object = $object_name |
102 | | - $_togrant_object = $object_name |
| 107 | + $_granted_object = $_object_name |
| 108 | + $_togrant_object = $_object_name |
103 | 109 | } |
104 | 110 |
|
105 | 111 | $_unless = $unless_function ? { |
|
0 commit comments