Merge pull request puppetlabs#574 from mhaskel/thankyou_geppetto

Rework defaults for `$object_name` in `postgresql::server::grant`

Author: hunner

manifests/globals.pp

@@ -107,7 +107,6 @@
     '9.3'   => '2.1',
     '9.4'   => '2.1',
     '93'    => '2.1',
-    '9.4'   => '2.1',
     default => undef,
   }
   $globals_postgis_version = pick($postgis_version, $default_postgis_version)

manifests/server/grant.pp

@@ -4,14 +4,20 @@
   $db,
   $privilege   = undef,
   $object_type = 'database',
-  $object_name = $db,
+  $object_name = undef,
   $psql_db     = $postgresql::server::default_database,
   $psql_user   = $postgresql::server::user,
   $port        = $postgresql::server::port
 ) {
   $group     = $postgresql::server::group
   $psql_path = $postgresql::server::psql_path
 
+  if ! $object_name {
+    $_object_name = $db
+  } else {
+    $_object_name = $object_name
+  }
+
   ## Munge the input values
   $_object_type = upcase($object_type)
   $_privilege   = upcase($privilege)
@@ -93,13 +99,13 @@
   #   object_type => 'TABLE',
   #   object_name => [$schema, $table],
   # }
-  if is_array($object_name) {
-    $_togrant_object = join($object_name, '"."')
+  if is_array($_object_name) {
+    $_togrant_object = join($_object_name, '"."')
     # Never put double quotes into has_*_privilege function
-    $_granted_object = join($object_name, '.')
+    $_granted_object = join($_object_name, '.')
   } else {
-    $_granted_object = $object_name
-    $_togrant_object = $object_name
+    $_granted_object = $_object_name
+    $_togrant_object = $_object_name
   }
 
   $_unless = $unless_function ? {