Makefile, pg_amqp.c, librabbitmq: updating librabbitmq-c to current v…

META.json

@@ -1,10 +1,10 @@
 {
    "name": "pg_amqp",
    "abstract": "AMQP protocol support for PostgreSQL",
-   "version": "0.4.2",
+   "version": "0.5.0",
    "description": "The pg_amqp package provides the ability for postgres statements to directly publish messages to an AMQP broker.",
-   "maintainer": 
-       [ "Theo Schlossnagle <[email protected]>", "Keith Fiske <[email protected]" ] 
+   "maintainer":
+       [ "Theo Schlossnagle <[email protected]>", "Keith Fiske <[email protected]" ]
    "license": [ "bsd", "mozilla_1_0" ],
    "generated_by": "Keith Fiske",
    "status": "stable",
@@ -19,7 +19,7 @@
      "amqp": {
        "file": "sql/amqp--0.4.1.sql",
         "docfile": "doc/amqp.md",
-       "version": "0.4.1",
+       "version": "0.5.0",
        "abstract": "AMQP protocol support for PostgreSQL"
      }
    },
@@ -32,7 +32,7 @@
            "web": "https://github.com/omniti-labs/pg_amqp",
            "type": "git"
        }
-   },    
+   },
 
    "meta-spec": {
       "version": "1.0.0",

Makefile

@@ -3,8 +3,12 @@ EXTVERSION   = $(shell grep default_version $(EXTENSION).control | \
                sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 PG_CONFIG    = pg_config
 PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
+REGRESS      = smoke_test
 
 ifeq ($(PG91),yes)
+CFLAGS_SL='-D HAVE_POLL'
+# Windows Support
+# CFLAGS_SL='-D HAVE_SELECT'
 DOCS         = $(wildcard doc/*.*)
 #TESTS        = $(wildcard test/sql/*.sql)
 #REGRESS      = $(patsubst test/sql/%.sql,%,$(TESTS))
@@ -13,7 +17,7 @@ MODULE_big   = $(patsubst src/%.c,%,$(wildcard src/*.c))
 OBJS         = src/pg_amqp.o \
 	src/librabbitmq/amqp_api.o src/librabbitmq/amqp_connection.o src/librabbitmq/amqp_debug.o \
 	src/librabbitmq/amqp_framing.o src/librabbitmq/amqp_mem.o src/librabbitmq/amqp_socket.o \
-	src/librabbitmq/amqp_table.o
+	src/librabbitmq/amqp_table.o src/librabbitmq/amqp_tcp_socket.o src/librabbitmq/amqp_time.o
 
 
 all: sql/$(EXTENSION)--$(EXTVERSION).sql

amqp.control

@@ -1,6 +1,6 @@
 # amqp extension
 comment = 'AMQP protocol support for PostgreSQL'
-default_version = '0.4.2'
+default_version = '0.5.0'
 module_pathname = '$libdir/pg_amqp'
 relocatable = false
 schema = amqp

expected/smoke_test.out

@@ -0,0 +1,15 @@
+CREATE EXTENSION amqp;
+INSERT INTO amqp.broker (broker_id, host, port, vhost, username, password) VALUES ('10000', '127.0.0.1', '5672', '/', 'guest', 'guest');
+SELECT amqp.publish(10000, 'amq.direct', 'foo', 'message');
+ publish 
+---------
+ t
+(1 row)
+
+SELECT amqp.publish(10000, 'amq.direct', 'foo', 'message', 1, 'application/json', 'some_reply_to', 'correlation_id');
+ publish 
+---------
+ t
+(1 row)
+
+DELETE FROM amqp.broker WHERE broker_id = '10000';

sql/smoke_test.sql

@@ -0,0 +1,5 @@
+CREATE EXTENSION amqp;
+INSERT INTO amqp.broker (broker_id, host, port, vhost, username, password) VALUES ('10000', '127.0.0.1', '5672', '/', 'guest', 'guest');
+SELECT amqp.publish(10000, 'amq.direct', 'foo', 'message');
+SELECT amqp.publish(10000, 'amq.direct', 'foo', 'message', 1, 'application/json', 'some_reply_to', 'correlation_id');
+DELETE FROM amqp.broker WHERE broker_id = '10000';

src/librabbitmq/LICENSE-MIT

@@ -0,0 +1,28 @@
+Portions created by Alan Antonuk are Copyright (c) 2012-2013
+Alan Antonuk. All Rights Reserved.
+
+Portions created by VMware are Copyright (c) 2007-2012 VMware, Inc.
+All Rights Reserved.
+
+Portions created by Tony Garnock-Jones are Copyright (c) 2009-2010
+VMware, Inc. and Tony Garnock-Jones. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.