Merge commit 'c632ac480e6fffc79c32845a34488574fc5bc685'

Conflicts: Makefile README.md mongo_fdw.c mongo_query.c
EltonARodrigues · Sep 24, 2014 · 9b66014 · 9b66014
2 parents f4f6c42 + c632ac4
commit 9b66014
Showing 76 changed files with 399 additions and 13,887 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,10 @@
 
 # Executables
 *.exe
-*.out
 *.app
 *.i*86
 *.x86_64
 *.hex
+
+# pgregress results directory
+results/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mongo-c-driver"]
+	path = mongo-c-driver
+	url = ../../mongodb/mongo-c-driver.git
diff --git a/Makefile b/Makefile
@@ -13,16 +13,21 @@ MODULE_big = mongo_fdw
 # environment object file.
 #
 
-MONGO_DRIVER = mongo-c-driver-v0.6
+MONGO_DRIVER = mongo-c-driver
 MONGO_PATH = $(MONGO_DRIVER)/src
-MONGO_OBJS = $(MONGO_PATH)/bson.os $(MONGO_PATH)/encoding.os $(MONGO_PATH)/md5.os $(MONGO_PATH)/mongo.os $(MONGO_PATH)/numbers.os $(MONGO_PATH)/env_posix.os
+MONGO_OBJS = $(MONGO_PATH)/bson.os $(MONGO_PATH)/encoding.os $(MONGO_PATH)/md5.os \
+             $(MONGO_PATH)/mongo.os $(MONGO_PATH)/numbers.os $(MONGO_PATH)/env.os
 
 PG_CPPFLAGS = --std=c99 -I$(MONGO_PATH)
 OBJS = connection.o option.o  mongo_wrapper.o mongo_fdw.o mongo_query.o $(MONGO_OBJS)
 
 EXTENSION = mongo_fdw
 DATA = mongo_fdw--1.0.sql
 
+REGRESS = mongo_fdw
+REGRESS_OPTS = --inputdir=test --outputdir=test \
+	       --load-extension=$(EXTENSION)
+
 $(MONGO_DRIVER)/%.os:
 	$(MAKE) -C $(MONGO_DRIVER) $*.os
 

diff --git a/Makefile.legacy b/Makefile.legacy
diff --git a/README.md b/README.md
@@ -7,113 +7,20 @@ PostgreSQL Version **9.3** and greater.
 
 ## 1 - Installation
 
-This [MongoDB][1] Foreign Data Wrapper is compatible with two [MongoDB][1]'s 'C' drivers, [MongoDB's Legacy C driver][6] and [MongoDB's C Driver][7]. [MongoDB][1]'s driver to use is decided at compile time using a different Makefile.
+The MongoDB FDW depends on the official MongoDB C Driver version 0.8  and
+includes it as a git submodule. If you are cloning this repository for the
+first time, be sure to pass the --recursive option to git clone in order to
+initialize the driver submodule to a useable
+state.
 
-### 1.1 - Compiling Using 'Legacy C' Driver###
+If have checked out this project before and for some reason your submodule is
+not up-to-date, run git submodule update --init.
 
-The [MongoDB][1]'s FDW includes the source code of [MongoDB's Legacy C Driver][6] version **0.6**.
-
-1 - Export `pg_config` Path
-
-To build on POSIX-compliant systems (like Linux and OS X), you require to ascertain
-that `pg_config` executable is in your path when you run make. This executable is typically in your PostgreSQL installation's bin directory.
-
-```sh
-# export PATH=/usr/local/pgsql/bin:$PATH
-```
-
-2 - Compile code
-
-```sh
-# make
-```
-
-OR
-
-```sh
-# make -f Makefile.legacy
-```
-
-*Note: [MongoDB's Legacy C driver][6] will be compiled automatically.*
-
-3 - Install
-
-```sh
-# make install
-```
-OR
-
-```sh
-# make -f Makefile.legacy install
-```
-
-### 1.2 - Compile Using [MongoDB][7]'s C Driver
-
-The source code of [MongoDB's C Driver][7] is not part of this repository. It can be downloaded from  
-
-https://github.com/mongodb/mongo-c-driver
-
-
-#### 1.2.1 - Install MongoDB's C Driver
-
-1 - Download [MongoDB's C Driver][7]
-
-```sh
-git clone https://github.com/mongodb/mongo-c-driver.git mongo-c-meta-driver
-```
-
-2 - Change directory
-
-```sh
-cd mongo-c-meta-driver
-```
-
-3 - Configure Driver
-
-```sh
-./autogen.sh
-```
-
-4 - Compile Driver
-
-```sh
-make
-```
-
-5 - Install Driver
-
-```sh
-make install
-```
+When you type `make`, the C driver's source code also gets automatically
+compiled and linked.
 
 *Note: Make sure you have permission to "/usr/local" (default installation location) folder.*
 
-#### 1.2.2 - Install Foreign Data Wrapper
-
-1 -  Change configuration
-
-Add `#deine META_DRIVER` in `config.h` file
-
-1 - Export `pg_config` Path
-
-To build on POSIX-compliant systems (like Linux and OS X), you require to ascertain
-that `pg_config` executable is in your path when you run make. This executable is typically in your PostgreSQL installation's bin directory.
-
-```sh
-# export PATH=/usr/local/pgsql/bin:$PATH
-```
-
-2 - Compile code
-
-```sh
-# make -f Makefile.meta
-```
-2 - Install
-
-```sh
-# make -f Makefile.meta install
-```
-
 *Note that we have verified the `mongo_fdw` extension only on MacOS X, Fedora and Ubuntu
 systems. If you run into issues on other systems, please [let us know][3]*
 

diff --git a/mongo-c-driver b/mongo-c-driver
diff --git a/mongo-c-driver-v0.6/.astylerc b/mongo-c-driver-v0.6/.astylerc
diff --git a/mongo-c-driver-v0.6/.gitignore b/mongo-c-driver-v0.6/.gitignore
diff --git a/mongo-c-driver-v0.6/APACHE-2.0.txt b/mongo-c-driver-v0.6/APACHE-2.0.txt
diff --git a/mongo-c-driver-v0.6/HISTORY.md b/mongo-c-driver-v0.6/HISTORY.md
diff --git a/mongo-c-driver-v0.6/Makefile b/mongo-c-driver-v0.6/Makefile
diff --git a/mongo-c-driver-v0.6/README.md b/mongo-c-driver-v0.6/README.md
diff --git a/mongo-c-driver-v0.6/SConstruct b/mongo-c-driver-v0.6/SConstruct
diff --git a/mongo-c-driver-v0.6/check_int64.sh b/mongo-c-driver-v0.6/check_int64.sh
diff --git a/mongo-c-driver-v0.6/docs/buildscripts/docs.py b/mongo-c-driver-v0.6/docs/buildscripts/docs.py
diff --git a/mongo-c-driver-v0.6/docs/examples/example.c b/mongo-c-driver-v0.6/docs/examples/example.c
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/Makefile b/mongo-c-driver-v0.6/docs/source/sphinx/Makefile
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/make.bat b/mongo-c-driver-v0.6/docs/source/sphinx/make.bat
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/bson.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/bson.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/building.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/building.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/conf.py b/mongo-c-driver-v0.6/docs/source/sphinx/source/conf.py
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/connections.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/connections.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/errors.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/errors.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/index.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/index.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/tutorial.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/tutorial.rst
diff --git a/mongo-c-driver-v0.6/docs/source/sphinx/source/write_concern.rst b/mongo-c-driver-v0.6/docs/source/sphinx/source/write_concern.rst
diff --git a/mongo-c-driver-v0.6/doxygenConfig b/mongo-c-driver-v0.6/doxygenConfig
diff --git a/mongo-c-driver-v0.6/runtests.sh b/mongo-c-driver-v0.6/runtests.sh