added loc-if.t to test directives used in location if blocks.

agentzh · agentzh · commit f2c9621c00bc · 2010-11-02T11:51:10.000+08:00
diff --git a/src/ngx_postgres_module.c b/src/ngx_postgres_module.c
@@ -82,7 +82,8 @@ static ngx_command_t ngx_postgres_module_commands[] = {
       NULL },
 
     { ngx_string("postgres_output"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|
+          NGX_HTTP_LIF_CONF|NGX_CONF_TAKE123,
       ngx_postgres_conf_output,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
diff --git a/test/t/loc-if.t b/test/t/loc-if.t
@@ -0,0 +1,107 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+repeat_each(1);
+
+plan tests => repeat_each() * (blocks() * 3);
+
+our $http_config = <<'_EOC_';
+    upstream database {
+        postgres_server     127.0.0.1:5432 dbname=ngx_test
+                            user=ngx_test password=ngx_test;
+    }
+_EOC_
+
+worker_connections(128);
+run_tests();
+
+no_diff();
+
+__DATA__
+
+=== TEST 1: postgres_pass and postgres_query work in location if blocks
+--- http_config
+    upstream database {
+        postgres_server     127.0.0.1:5432 dbname=ngx_test
+                            user=ngx_test password=ngx_test;
+        postgres_keepalive  off;
+    }
+--- config
+    location /postgres {
+        if ($arg_foo) {
+            postgres_pass       database;
+            postgres_query      "select * from cats";
+            break;
+        }
+
+        return 404;
+    }
+--- request
+GET /postgres?foo=1
+--- error_code: 200
+--- response_headers
+Content-Type: application/x-resty-dbd-stream
+--- response_body eval
+"\x{00}".        # endian
+"\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
+"\x{00}".        # result type
+"\x{00}\x{00}".  # std errcode
+"\x{02}\x{00}".  # driver errcode
+"\x{00}\x{00}".  # driver errstr len
+"".              # driver errstr data
+"\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}".  # rows affected
+"\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}\x{00}".  # insert id
+"\x{02}\x{00}".  # col count
+"\x{09}\x{00}".  # std col type (integer/int)
+"\x{17}\x{00}".  # driver col type
+"\x{02}\x{00}".  # col name len
+"id".            # col name data
+"\x{06}\x{80}".  # std col type (varchar/str)
+"\x{19}\x{00}".  # driver col type
+"\x{04}\x{00}".  # col name len
+"name".          # col name data
+"\x{01}".        # valid row flag
+"\x{01}\x{00}\x{00}\x{00}".  # field len
+"2".             # field data
+"\x{ff}\x{ff}\x{ff}\x{ff}".  # field len
+"".              # field data
+"\x{01}".        # valid row flag
+"\x{01}\x{00}\x{00}\x{00}".  # field len
+"3".             # field data
+"\x{03}\x{00}\x{00}\x{00}".  # field len
+"bob".           # field data
+"\x{00}"         # row list terminator
+--- timeout: 10
+
+
+
+=== TEST 1: postgres_pass and postgres_query work in location if blocks
+--- http_config
+    upstream database {
+        postgres_server     127.0.0.1:5432 dbname=ngx_test
+                            user=ngx_test password=ngx_test;
+        postgres_keepalive  off;
+    }
+--- config
+    location /postgres {
+        default_type text/plain;
+        if ($arg_foo) {
+            postgres_pass       database;
+            postgres_query      "select * from cats order by id";
+            postgres_output     value 0 0;
+            break;
+        }
+
+        return 404;
+    }
+--- request
+GET /postgres?foo=1
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body chomp
+2
+
