pgbundle 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f31c6d663d2a95c1df84d4a32798b755e34033
-  data.tar.gz: bd4b093c3c50837936317417fbe9c9b09f93603e
+  metadata.gz: 5c92283e7b0cdc9239828c2e0b0c4c0f0de445f8
+  data.tar.gz: d17777f703f2296061e87d11e8dc1f91f5915d9b
 SHA512:
-  metadata.gz: 0f0d0754be9f1769ff53436ef752842b52011e60a3cda8c714ff3908697139369d98a22c2f72d3b26ef4ef332a47653c8ac649e74a25a1e1405c51b1ce73580e
-  data.tar.gz: ae01c5f1ae1f1a83ab077d3805ccf3ad4dc777722ea5bb323b958090477650008a418c4b5fb4e31642dac02cf05f166802f8c99b62c00be344dba2ce638a76c7
+  metadata.gz: cb211cac9c484da384c3e70cff5125060fd5e548839ebdb4673f42f4305a4c50b3d7dc22181c21a1b55a50ceec1d3624d58de8dc107114e459ed26f71bb7e387
+  data.tar.gz: ad84fbf4ce4985c9fb6be3b8b363068e16930df7b83c83f505cb0d686581e2785d7f4239c62cd7938fab6fe31cffc35dce4fd6841875aa501a165b54b274f041

data/bin/pgbundle

@@ -44,6 +44,13 @@ module PgBundle
       exit 1 if missing
     end
 
+    desc 'create', 'create the extension at the desired version'
+    def create(pgfile = 'Pgfile')
+      definition(pgfile).create.each do | d |
+        say_status('created', d.name)
+      end
+    end
+
     desc 'init', 'write an initial pgfile to stdout'
     method_options %w( user -u ) => :string
     method_options %w( host -h ) => :string

data/lib/pgbundle/database.rb

@@ -32,6 +32,8 @@ module PgBundle
       end
     end
 
+    alias_method :exec, :execute
+
     def transaction(&block)
       silence do
         connection.transaction(&block)

data/lib/pgbundle/definition.rb

@@ -40,6 +40,14 @@ module PgBundle
       installed.select { |dep| dep.available?(database) }
     end
 
+    # create all required extensions
+    def create
+      extensions.map do |_, dep|
+        dep.create_with_dependencies(database)
+        dep
+      end
+    end
+
     def init
       ["database '#{database.name}', host: '#{database.host}', user: #{database.user}, system_user: #{database.system_user}, use_sudo: #{database.use_sudo}"] +
       database.current_definition.map do |r|

data/lib/pgbundle/extension.rb

@@ -65,11 +65,11 @@ module PgBundle
     end
 
     # returns true if extension is already created with the correct version in the given database
-    def created?(database)
+    def created?(database_or_connection)
       if version
-        result = database.execute("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND version = '#{version}' AND installed").to_a
+        result = database_or_connection.exec("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND version = '#{version}' AND installed").to_a
       else
-        result = database.execute("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND installed").to_a
+        result = database_or_connection.exec("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND installed").to_a
       end
 
       if result.empty?
@@ -81,11 +81,11 @@ module PgBundle
 
     # returns if the extension is already installed on the database system
     # if it is also already created it returns the installed version
-    def installed?(database)
+    def installed?(database_or_connection)
       if version
-        result = database.execute("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND version = '#{version}'").to_a
+        result = database_or_connection.exec("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND version = '#{version}'").to_a
       else
-        result = database.execute("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}'").to_a
+        result = database_or_connection.exec("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}'").to_a
       end
 
       if result.empty?
@@ -123,11 +123,22 @@ module PgBundle
       make_uninstall(database)
     end
 
-    private
+    # create the extension along with it's dependencies in a transaction
+    def create_with_dependencies(database)
+      return true if created?(database)
 
-    # create extension on a given database connection
-    def create!(con)
-      con.exec create_stmt
+      database.transaction do |con|
+        begin
+          create_dependencies(con)
+          create_or_update!(con)
+        rescue PG::UndefinedFile => err
+          raise ExtensionNotFound.new(name, version)
+        rescue PG::UndefinedObject => err
+          raise MissingDependency.new(name, err.message)
+        end
+      end
+
+      true
     end
 
     # create the dependency graph on the given connection
@@ -136,14 +147,31 @@ module PgBundle
       dependencies.each do |_, d|
         fail CircularDependencyError.new(name, d.name) if d.resolving_dependencies
         d.create_dependencies(con)
-        d.create!(con)
+        d.create_or_update!(con)
       end
       @resolving_dependencies = false
     end
 
+    # create extension on a given database connection
+    def create!(con)
+      con.exec create_stmt
+    end
+
+    def create_or_update!(con)
+      return true if created?(con)
+      if created_any_version?(con)
+        con.exec update_stmt
+      else
+        create!(con)
+      end
+      true
+    end
+
+
+
     # checks if Extension is already installed at any version thus need ALTER EXTENSION to install
-    def created_any_version?(database)
-      result = database.execute("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND installed").to_a
+    def created_any_version?(database_or_connection)
+      result = database_or_connection.exec("SELECT * FROM pg_available_extension_versions WHERE name ='#{name}' AND installed").to_a
       if result.empty?
         false
       else
@@ -151,6 +179,8 @@ module PgBundle
       end
     end
 
+    private
+
     # adds dependencies that are required but not defined yet
     def add_missing_required_dependencies(database)
       requires = requires(database)
@@ -199,7 +229,7 @@ module PgBundle
     # loads the source and runs make install
     # returns: self
     def make_install(database, force = false)
-      return self if installed?(database) && !force
+      return self if installed?(database) && (!force || source.nil?)
 
       fail SourceNotFound, name if source.nil?
 
@@ -214,6 +244,10 @@ module PgBundle
       stmt
     end
 
+    def update_stmt
+      "ALTER EXTENSION #{name} UPDATE TO '#{version}'"
+    end
+
     def install_dependencies(database, force = false)
       begin
         dependencies.each do |_, d|
@@ -251,7 +285,7 @@ module PgBundle
       result = true
       database.execute 'BEGIN'
       begin
-        database.execute "ALTER EXTENSION #{name} UPDATE TO '#{version}'"
+        database.execute update_stmt
       rescue PG::UndefinedFile, PG::UndefinedObject => err
         @error = err.message
         result = false

data/lib/pgbundle/version.rb

@@ -1,3 +1,3 @@
 module Pgbundle
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbundle
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Manuel Kniep
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: bundling postgres extension