createDB

docker/Dockerfile

@@ -46,7 +46,7 @@ RUN cd /home/maybms/src/postgresql-8.3.3 \
 ########################################
 # Environment
 ########################################
-ENV PGDATA /home/maybms/data
+ENV PGDATA /home/maybms/datadir
 ENV PATH /home/maybms/install/bin:$PATH
 ########################################
 # Expose postmaster port
@@ -60,7 +60,6 @@ RUN cd /home/maybms/src/pip_plugin && make && make install
 # Add datadir as volume to persist across container restarts
 ########################################
 RUN ["/home/maybms/src/docker/createDB.sh","maybms"]
-#RUN /home/maybms/install/bin/initdb -D /home/maybms/data
 ########################################
 # Per default start postgres
 ########################################
@@ -68,5 +67,5 @@ ENTRYPOINT ["/home/maybms/install/bin/postgres"]
 ########################################
 # Per default connect to the example cluster
 ########################################
-CMD ["-D", "/home/maybms/data"]
-VOLUME /home/maybms/data
+CMD ["-D", "/home/maybms/datadir"]
+VOLUME /home/maybms/datadir

docker/createDB.sh

@@ -3,7 +3,7 @@ PGUSER=$1
 MAYBMSHOME=/home/maybms
 SRCDIR=${MAYBMSHOME}/src
 INSTALLBINDIR=${MAYBMSHOME}/install/bin
-DATADIR=${MAYBMSHOME}/data
+DATADIR=${MAYBMSHOME}/datadir
 ####################
 echo ---- Configure Maybms installation and create TestDatabase
 echo -- for user ${PGUSER} with INSTALLBINDIR=${INSTALLBINDIR} and DATADIR=${DATADIR}

pip_plugin/src/patch/test/regress/sql/type_sanity.sql

@@ -60,7 +60,7 @@ WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
            p2.typelem = p1.oid and p1.typarray = p2.oid);
 
 -- Make sure typarray points to a varlena array type of our own base
-SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, 
+SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype,
        p2.typelem, p2.typlen
 FROM   pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid)
 WHERE  p1.typarray <> 0 AND