pg_saurus 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4147b6ee5df11ef09825b5c6b5d59d0521b357b
-  data.tar.gz: ee5a976b7fdd83f17492d3a877a11d4ebbc25a62
+  metadata.gz: 95526ab7651625ecb8d454074e855cbddb574524
+  data.tar.gz: a44975a7e86b74893dbec2ded843a2a82b80780c
 SHA512:
-  metadata.gz: 8689fb75e3adea700b5a1ced18232efccac99b3989370fbfbfe8ec3e9ef926f6bb97b8302fd0c59b22abfeeb01a716a521000c978fb6aa672a1517c5019402df
-  data.tar.gz: 23c7d58b7eeae4ad725c301cf54393eaccf36b1c7ac6ddbd3740846aafa54401e668c06bc5a2c01abd46ec67aefd55bfc8fa1e8019ff8980a7093ed0c83edfaa
+  metadata.gz: edde7148883c2b70be2f90ec6894fd4cabb644c6e981af6a224c8842ab9f6b221e2a4e4c624f396d4f54b0249d09fbd2eee79666fd2e815fbdb1d78f910e773b
+  data.tar.gz: ab9d11096b351eb872a7c8a16e5569ccce00a657863a4293987d34a5f844c3c19f9df540f2b7466a3a07544d172ed2f5a9299e9ce83a4ee3b3e62f54a14322c5

data/README.markdown

@@ -366,8 +366,8 @@ BEGIN
 END;
 SQL
 
-# Arguments are: function_name, return_type, function_definition, options (currently, only :schema)
-create_function 'pets_not_empty()', :boolean, pets_not_empty_function, schema: 'public'
+# Arguments are: function_name, return_type, function_definition, options (currently, only :schema and :volatility)
+create_function 'pets_not_empty()', :boolean, pets_not_empty_function, schema: 'public', volatility: 'stable'
 ```
 Drop a function:
 

data/lib/pg_saurus/connection_adapters/function_definition.rb

@@ -5,6 +5,7 @@ module PgSaurus::ConnectionAdapters
                                          :definition,
                                          :function_type,
                                          :language,
-                                         :oid )
+                                         :oid,
+                                         :volatility )
   end
 end

data/lib/pg_saurus/connection_adapters/postgresql_adapter/function_methods.rb

@@ -39,6 +39,7 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
       name       = parse_function_name(function_str)
       language   = parse_function_language(function_str)
       definition = parse_function_definition(function_str)
+      volatility = parse_function_volatility(function_str)
 
       if definition
         buffer << ::PgSaurus::ConnectionAdapters::FunctionDefinition.new(name,
@@ -46,7 +47,8 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
                                                                          definition.strip,
                                                                          function_type,
                                                                          language,
-                                                                         oid)
+                                                                         oid,
+                                                                         volatility)
       end
       buffer
     end
@@ -62,11 +64,17 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
                     else
                       'OR REPLACE '
                     end
+    volatility    = case options[:volatility]
+                    when :volatile, :stable, :immutable
+                      "\n  #{options[:volatility].to_s.upcase}"
+                    else
+                      ""
+                    end
 
     sql = <<-SQL.gsub(/^[ ]{6}/, "")
       CREATE #{replace}FUNCTION #{function_name}
         RETURNS #{returning}
-        LANGUAGE #{language}
+        LANGUAGE #{language}#{volatility}
       AS $function$
       #{definition.strip}
       $function$
@@ -97,6 +105,24 @@ module PgSaurus::ConnectionAdapters::PostgreSQLAdapter::FunctionMethods
   end
   private :parse_function_language
 
+  # Retrieve the volatility of the function: volatile, stable, or immutable.
+  # @return [Symbol]
+  def parse_function_volatility(function_str)
+    rows       = function_str.split("\n")
+    lang_index = rows.index { |line| line =~ /LANGUAGE/ }
+    def_index  = rows.index { |line| line =~ /AS \$function\$/ }
+
+    if lang_index && def_index && def_index - lang_index == 2
+      tokens = rows[def_index - 1].strip.downcase.split(" ")
+      token  = tokens.find { |t| %w(volatile stable immutable).include? t }
+
+      token.nil? ? :volatile : token.to_sym
+    else
+      :volatile
+    end
+  end
+  private :parse_function_volatility
+
   # Retrieve the function definition from the function SQL.
   def parse_function_definition(function_str)
     function_str[/#{Regexp.escape("AS $function$\n")}(.*?)#{Regexp.escape("$function$")}/m, 1]

data/lib/pg_saurus/schema_dumper/function_methods.rb

@@ -3,17 +3,19 @@ module PgSaurus::SchemaDumper::FunctionMethods
 
   # :nodoc
   def tables_with_functions(stream)
-    tables_without_functions(stream)
-
+    # Functions must be dumped before tables.
+    # Some indexes may use defined functions.
     dump_functions stream
 
+    tables_without_functions(stream)
+
     stream
   end
 
   # Writes out a command to create each detected function.
   def dump_functions(stream)
     @connection.functions.each do |function|
-      statement = "  create_function '#{function.name}', :#{function.returning}, <<-FUNCTION_DEFINITION.gsub(/^[\s]{4}/, '')"
+      statement = "  create_function '#{function.name}', :#{function.returning}, <<-FUNCTION_DEFINITION.gsub(/^[\s]{4}/, ''), volatility: :#{function.volatility}"
       statement << "\n#{function.definition.split("\n").map{|line| "    #{line}" }.join("\n")}"
       statement << "\n  FUNCTION_DEFINITION\n\n"
 

data/lib/pg_saurus/version.rb

@@ -1,4 +1,4 @@
 module PgSaurus
   # Version of pg_saurus gem.
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg