Skip to content

Commit

Permalink
Adds support for Postgres 9.2 extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Ines Sombra committed Dec 10, 2012
1 parent 7e72854 commit 5f58824
Show file tree
Hide file tree
Showing 38 changed files with 329 additions and 333 deletions.
25 changes: 13 additions & 12 deletions cookbooks/main/recipes/default.rb
Expand Up @@ -38,7 +38,7 @@

#uncomment to run the exim::auth recipe
#require_recipe "exim::auth"
require_recipe "mongodb"
#require_recipe "mongodb"

#uncomment to run the resque recipe
# require_recipe "resque"
Expand Down Expand Up @@ -93,7 +93,7 @@

#enable Extension modules for a given Postgresql database
# if ['solo','db_master', 'db_slave'].include?(node[:instance_role])
# Extensions that support both Postgres 9.0 and 9.1
# Extensions that support both Postgres 9.0, 9.1 and 9.2
# postgresql9_autoexplain "dbname"
# postgresql9_btree_gin "dbname"
# postgresql9_btree_gist "dbname"
Expand All @@ -110,25 +110,26 @@
# postgresql9_isn "dbname"
# postgresql9_lo "dbname"
# postgresql9_ltree "dbname"
# postgresql9_pg_trgm "dbname"
# postgresql9_pg_trgm "dbname"
# postgresql9_pgcrypto "dbname"
# postgresql9_pgrowlocks "dbname"
# postgresql9_postgis "dbname"
# postgresql9_postgis "dbname" - Only works for 9.0 and 9.1 atm
# postgresql9_seg "dbname"
# postgresql9_sslinfo "dbname"
# postgresql9_tablefunc "dbname"
# postgresql9_test_parser "dbname"
# postgresql9_unaccent "dbname"
# postgresql9_uuid_ossp "dbname"
# 9.1 Extensions
# postgresql9_file_fdw "dbname"


# 9.1 and 9.2 Extensions
# postgresql9_file_fdw "dbname"
# postgresql9_xml2 "dbname"


# 9.2 Extensions
# postgresql9_pg_stat_statements "dbname"

#Admin-Level Contribs
# postgresql9_pg_buffercache "postgres"
# postgresql9_pg_freespacemap "postgres"
# postgresql9_pg_stat_statements "todo" - Not done

# end
#end
267 changes: 135 additions & 132 deletions cookbooks/postgresql9_extensions/README.md

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion cookbooks/postgresql9_extensions/attributes/recipe.rb
Expand Up @@ -4,5 +4,7 @@
postgres_version("9.0")
elsif db_stack == "postgres9_1"
postgres_version("9.1")
elsif db_stack == "postgres9_2"
postgres_version("9.2")
end
postgres_root("/db/postgresql/")
postgres_root("/db/postgresql/")
12 changes: 5 additions & 7 deletions cookbooks/postgresql9_extensions/definitions/auto_explain.rb
@@ -1,14 +1,12 @@
define :postgresql9_autoexplain do
dbname_to_use = params[:name]
load_shared_library do
db_name dbname_to_use

load_shared_library do
db_name dbname_to_use
library_name "auto_explain"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

include_recipe "postgresql9_extensions::ext_autoexplain"

end


11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/btree_gin.rb
@@ -1,11 +1,10 @@
define :postgresql9_btree_gin do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
username "postgres"
extname "btree_gin"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/btree_gist.rb
@@ -1,11 +1,10 @@
define :postgresql9_btree_gist do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
username "postgres"
extname "btree_gist"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/chkpass.rb
@@ -1,11 +1,10 @@
define :postgresql9_chkpass do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
username "postgres"
extname "chkpass"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/citext.rb
@@ -1,10 +1,9 @@
define :postgresql9_citext do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "citext"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/cube.rb
@@ -1,10 +1,9 @@
define :postgresql9_cube do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "cube"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/dblink.rb
@@ -1,10 +1,9 @@
define :postgresql9_dblink do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "dblink"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/dict_int.rb
@@ -1,10 +1,9 @@
define :postgresql9_dict_int do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "dict_int"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/dict_xsyn.rb
@@ -1,10 +1,9 @@
define :postgresql9_dict_xsyn do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "dict_xsyn"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/earthdistance.rb
@@ -1,10 +1,9 @@
define :postgresql9_earthdistance do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "earthdistance"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/file_fdw.rb
@@ -1,10 +1,9 @@
define :postgresql9_file_fdw do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "file_fdw"
supported_versions %w[9.1]
supported_versions %w[9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/fuzzystrmatch.rb
@@ -1,10 +1,9 @@
define :postgresql9_fuzzystrmatch do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "fuzzystrmatch"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/hstore.rb
@@ -1,10 +1,9 @@
define :postgresql9_hstore do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "hstore"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/intarray.rb
@@ -1,10 +1,9 @@
define :postgresql9_intarray do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "intarray"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/isn.rb
@@ -1,10 +1,9 @@
define :postgresql9_isn do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "isn"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
11 changes: 5 additions & 6 deletions cookbooks/postgresql9_extensions/definitions/lo.rb
@@ -1,10 +1,9 @@
define :postgresql9_lo do
dbname_to_use = params[:name]
load_sql_file do
dbname_to_use = params[:name]

load_sql_file do
db_name dbname_to_use
extname "lo"
supported_versions %w[9.0 9.1]
supported_versions %w[9.0 9.1 9.2]
end

end
end
Expand Up @@ -2,7 +2,7 @@
library_name = params[:library_name]
db_name = params[:db_name]
supported_versions = params[:supported_versions]

if @node[:postgres_version] == "9.0" && supported_versions.include?("9.0")
execute "Postgresql loading library #{library_name}" do
command "psql -U postgres -d #{db_name} -c \"LOAD \'#{library_name}\'\";"
Expand All @@ -11,9 +11,9 @@
execute "Postgresql loading library #{library_name}" do
command "psql -U postgres -d #{db_name} -c \"LOAD \'#{library_name}\'\";"
end
elsif @node[:postgres_version] == "9.2" && supported_versions.include?("9.2")
execute "Postgresql loading library #{library_name}" do
command "psql -U postgres -d #{db_name} -c \"LOAD \'#{library_name}\'\";"
end
end

end



11 changes: 7 additions & 4 deletions cookbooks/postgresql9_extensions/definitions/load_sql_file.rb
Expand Up @@ -2,9 +2,9 @@
db_name = params[:db_name]
extname = params[:extname]
supported_versions = params[:supported_versions]
Chef::Log.info "Loading to database #{db_name} extension #{extname} supported on versions: (#{supported_versions}). PG version installed is #{@node[:postgres_version]}"

Chef::Log.info "Loading to database #{db_name} extension #{extname} supported on versions: #{supported_versions.join(", ")}. PG version installed is #{@node[:postgres_version]}"

if @node[:postgres_version] == "9.0" && supported_versions.include?("9.0")
execute "Postgresql loading contrib #{extname} on database #{db_name}" do
command "psql -U postgres -d #{db_name} -f /usr/share/postgresql-9.0/contrib/#{extname}.sql"
Expand All @@ -13,6 +13,9 @@
execute "Postgresql loading extension #{extname}" do
command "psql -U postgres -d #{db_name} -c \"CREATE EXTENSION IF NOT EXISTS #{extname}\";"
end
elsif @node[:postgres_version] == "9.2" && supported_versions.include?("9.2")
execute "Postgresql loading extension #{extname}" do
command "psql -U postgres -d #{db_name} -c \"CREATE EXTENSION IF NOT EXISTS #{extname}\";"
end
end

end

0 comments on commit 5f58824

Please sign in to comment.