activerecord-postgresql-extensions 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDVjMzkzNjNhYzc2MzQxNDkyZTA3MWQzM2FlZGZlZmQzYzkxMDkxNA==
+    OGY1YjMzZWU1ZmNjN2VmZDU5ODQyM2Q0ZDg3N2JjNjkwZTFkMTkwYQ==
   data.tar.gz: !binary |-
-    NjMzOTZjOTFkOGE3NTQyMmU1ODg2NzJhNmQ3MzQ3NjgwNTRkNzZhNQ==
+    ZGMxNWRjNjEwNzVhZjU1MzMxYTQ4ZTk0NWU2MjljYzViMDM5YzdjNQ==
 SHA512:
   metadata.gz: !binary |-
-    MzEzN2MzMjg4YjYzZWI5NjIyNWJmNmNjNjc1NmZiMjNkYjZmODM5MjUyN2Iw
-    NTJjYzBkYzMxZTZjYTk3OTE2ODZhZDZmZjc5YmUxNzY2YmIxMDdjZjRiMzk1
-    YjRjZjk0NTkxMDdjN2Q5MTRkYmM3YmMxMWU4MDhkZGFhMWMxMDA=
+    NWRkMmZiNWViMzE4ZjBhNDEzOWFlNGJkOTIxZjg1MjljM2IyOWVmM2QzODA2
+    OGQzOWY2YjRhY2UzMzE5MzBlN2YxYzM3MjZkMTUzYzc4NDM3Zjc3NzliZWZm
+    MTc5NDU2NGE2MjY2YjUxYzhiYTI5MTVlNmZiNDFjMmZkOWFlM2U=
   data.tar.gz: !binary |-
-    ZTUyOGIwZTc5MjAwMDRlZGE4ZTI0MzI5OTk1YTM1NjM3MTVkZGJlYjA2MTA0
-    MzczY2U4NTMwNDdhZTU2MmJhNTJmMjBlYjFmZDU1NzExMDI2ZjRhZmVhNzAz
-    YWNjYmE1NWU1MzkxMDk3ZDMwYzBiMzNkZGNhZjUyMTg5OTAzN2I=
+    YjQyYWU2ZDM3MjQ0NmFhNDVmOWI3N2U0MWZkZDM5MTRiNTRhZmFlM2M4N2Jj
+    YjdkZTUyODk5ZmFlYmJhNzVhMjdjZDc5YjdmY2QyODMxZmY2ZmIwZTBiNmE5
+    YmZkMjE4NmZhNjAzNWI4MjIwOThkNjYzMzg3ZjQyMTQ1ODQ3NTE=

data/lib/active_record/postgresql_extensions/functions.rb

@@ -89,14 +89,22 @@ module ActiveRecord
       # convoluted as evidenced by the plethora of options we're
       # handling here.
       #
-      # ==== Example
+      # ==== Examples
+      #
+      #   # With a string for the body:
+      #   create_function('tester_function', 'integer',
+      #     'integer', 'sql',
+      #     'select $1;'
+      #     :behavior => :immutable, :set => { :search_path => :from_current }, :force => true
+      #   )
       #
+      #   # With a block:
       #   create_function('tester_function', 'integer',
       #     'integer', 'sql', :behavior => :immutable, :set => { :search_path => :from_current }, :force => true) do
       #     "select $1;"
       #   end
       #
-      #   # Produces:
+      #   # Both produce:
       #   #
       #   # CREATE OR REPLACE FUNCTION "tester_function"(integer) RETURNS integer AS $$
       #   #   select $1;
@@ -104,9 +112,20 @@ module ActiveRecord
       #   # LANGUAGE "sql"
       #   #   IMMUTABLE
       #   #   SET "search_path" FROM CURRENT;
-      def create_function(name, args, returns, language, options = {})
-        body = yield.to_s
-        execute PostgreSQLFunctionDefinition.new(self, name, args, returns, language, body, options).to_s
+      def create_function(name, arguments, returns, language, *args)
+        options = args.extract_options!
+
+        body = if args.first.present?
+          if block_given?
+            raise ArgumentError.new("Can't have both a function body argument as well as a block in create_function")
+          end
+
+          args.first
+        elsif block_given?
+          yield.to_s
+        end
+
+        execute PostgreSQLFunctionDefinition.new(self, name, arguments, returns, language, body, options).to_s
       end
 
       # Drops a function.

data/lib/active_record/postgresql_extensions/version.rb

@@ -1,7 +1,7 @@
 
 module ActiveRecord
   module PostgreSQLExtensions
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end
 

data/test/functions_tests.rb

@@ -46,6 +46,45 @@ class FunctionsTests < PostgreSQLExtensionsTestCase
     assert_equal(expected, statements)
   end
 
+  def test_create_function_with_body_argument
+    ARBC.create_function(:test, :integer, :integer, :sql, "select 10;")
+
+    ARBC.create_function(:test, :integer, :integer, :sql, "return 10;", {
+      :force => true,
+      :delimiter => '$__$',
+      :behavior => :immutable,
+      :on_null_input => :strict,
+      :cost => 1,
+      :rows => 10,
+      :set => {
+        'TIME ZONE' => 'America/Halifax'
+      }
+    })
+
+    expected = []
+
+    expected << strip_heredoc(<<-SQL)
+      CREATE FUNCTION "test"(integer) RETURNS integer AS $$
+      select 10;
+      $$
+      LANGUAGE "sql";
+    SQL
+
+    expected << strip_heredoc(<<-SQL)
+      CREATE OR REPLACE FUNCTION "test"(integer) RETURNS integer AS $__$
+      return 10;
+      $__$
+      LANGUAGE "sql"
+          IMMUTABLE
+          STRICT
+          COST 1
+          ROWS 10
+          SET TIME ZONE "America/Halifax";
+    SQL
+
+    assert_equal(expected, statements)
+  end
+
   def test_drop_function
     ARBC.drop_function(:test, :integer)
     ARBC.drop_function(:test, :integer, :if_exists => true, :cascade => true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgresql-extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime