Merge branch 'master' into devel

agentzh · agentzh · commit 9b917d73b1e0 · 2011-05-02T13:53:49.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -68,3 +68,6 @@ all.sh
 build9
 t/servroot/
 buildroot/
+build10
+go
+all
diff --git a/t/000_init.t b/t/000_init.t
@@ -8,12 +8,19 @@ repeat_each(1);
 plan tests => repeat_each() * blocks();
 
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
+$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432;
 
 our $http_config = <<'_EOC_';
     upstream database {
         drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
     }
+
+    upstream pg {
+        postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
+                       dbname=ngx_test user=ngx_test password=ngx_test;
+    }
+
 _EOC_
 
 worker_connections(128);
@@ -77,3 +84,60 @@ GET /init
 GET /init
 --- error_code: 200
 --- timeout: 10
+
+
+
+=== TEST 5: cats - drop table - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "DROP TABLE IF EXISTS cats";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+
+
+
+=== TEST 6: cats - create table - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "CREATE TABLE cats (id integer, name text)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+
+
+
+=== TEST 7: cats - insert value - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "INSERT INTO cats (id) VALUES (2)";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+
+
+
+=== TEST 8: cats - insert value - pg
+--- http_config eval: $::http_config
+--- config
+    location = /init {
+        postgres_pass   pg;
+        postgres_query  "INSERT INTO cats (id, name) VALUES (3, 'bob')";
+    }
+--- request
+GET /init
+--- error_code: 200
+--- timeout: 10
+
diff --git a/util/build.sh b/util/build.sh
@@ -31,6 +31,7 @@ cd nginx-$version/
 
 if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
     ./configure --prefix=$root/work/nginx \
+            --with-cc-opt="-O3" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \
