Merge pull request puppetlabs#204 from mcanevet/set_istemplate

Add support for istemplate parameter where creating db

Author: hunner

README.md

@@ -325,6 +325,9 @@ Override the locale during creation of the database. Defaults to the default def
 ####`grant`
 Grant permissions during creation. Defaults to `ALL`.
 
+####`istemplate`
+Define database as a template. Defaults to `false`.
+
 ###Resource: postgresql::database
 This defined type can be used to create a database with no users and no permissions, which is a rare use case.
 
@@ -343,6 +346,9 @@ Override the character set during creation of the database. Defaults to the defa
 ####`locale`
 Override the locale during creation of the database. Defaults to the default defined during installation.
 
+####`istemplate`
+Define database as a template. Defaults to `false`.
+
 ###Resource: postgresql::database\_grant
 This defined type manages grant based access privileges for users. Consult the PostgreSQL documentation for `grant` for more information.
 

manifests/database.pp

@@ -24,7 +24,8 @@
   $owner = $postgresql::params::user,
   $tablespace = undef,
   $charset  = $postgresql::params::charset,
-  $locale   = $postgresql::params::locale
+  $locale   = $postgresql::params::locale,
+  $istemplate = false
 ) {
   include postgresql::params
 
@@ -76,4 +77,9 @@
     refreshonly => true,
   }
 
+  Exec [ $createdb_command ] ->
+
+  postgresql_psql {"UPDATE pg_database SET datistemplate = ${istemplate} WHERE datname = '${dbname}'":
+    unless => "SELECT datname FROM pg_database WHERE datname = '${dbname}' AND datistemplate = ${istemplate}",
+  }
 }

manifests/db.pp

@@ -36,21 +36,23 @@
 define postgresql::db (
   $user,
   $password,
-  $charset     = $postgresql::params::charset,
-  $locale      = $postgresql::params::locale,
-  $grant       = 'ALL',
-  $tablespace = undef
+  $charset    = $postgresql::params::charset,
+  $locale     = $postgresql::params::locale,
+  $grant      = 'ALL',
+  $tablespace = undef,
+  $istemplate = false
 ) {
   include postgresql::params
 
   postgresql::database { $name:
     # TODO: ensure is not yet supported
-    #ensure     => present,
-    charset     => $charset,
-    tablespace  => $tablespace,
-    #provider   => 'postgresql',
-    require     => Class['postgresql::server'],
-    locale      => $locale,
+    #ensure    => present,
+    charset    => $charset,
+    tablespace => $tablespace,
+    #provider  => 'postgresql',
+    require    => Class['postgresql::server'],
+    locale     => $locale,
+    istemplate => $istemplate,
   }
 
   if ! defined(Postgresql::Database_user[$user]) {

spec/system/install_spec.rb

@@ -95,6 +95,74 @@ class { 'postgresql::server': }
         psql('--command="drop database test1" postgres')
       end
     end
+
+    it 'should take an istemplate parameter' do
+      begin
+        pp = <<-EOS
+          $db = 'template2'
+          include postgresql::server
+
+          postgresql::db { $db:
+            user        => $db,
+            password    => postgresql_password($db, $db),
+            istemplate  => true,
+          }
+        EOS
+
+        puppet_apply(pp) do |r|
+          r.exit_code.should_not == 1
+        end
+
+        puppet_apply(pp) do |r|
+          r.exit_code.should == 0
+        end
+
+        psql('--command="select datname from pg_database" template2') do |r|
+          r.stdout.should =~ /template2/
+          r.stderr.should be_empty
+          r.exit_code.should == 0
+        end
+      ensure
+        psql('--command="drop database template2" postgres') do |r|
+          r.stdout.should be_empty
+          r.stderr.should =~ /cannot drop a template database/
+          r.exit_code.should_not == 0
+        end
+      end
+    end
+
+    it 'should update istemplate parameter' do
+      begin
+        pp = <<-EOS
+          $db = 'template2'
+          include postgresql::server
+
+          postgresql::db { $db:
+            user        => $db,
+            password    => postgresql_password($db, $db),
+            istemplate  => false,
+          }
+        EOS
+
+        puppet_apply(pp) do |r|
+          r.exit_code.should_not == 1
+        end
+
+        puppet_apply(pp) do |r|
+          r.exit_code.should == 0
+        end
+
+        psql('--command="select datname from pg_database" template2') do |r|
+          r.stdout.should =~ /template2/
+          r.stderr.should be_empty
+          r.exit_code.should == 0
+        end
+      ensure
+        psql('--command="drop database template2" postgres') do |r|
+          r.exit_code.should == 0
+        end
+      end
+    end
   end
 
   describe 'postgresql::psql' do