Merge branch '1.7' of https://github.com/jholtom-ciena/neo4j-fdw into jholtom-ciena-1.7

Author: sim51

README.adoc

@@ -46,6 +46,10 @@ This project is based on Multicorn, so you have to install it.
 NOTE: If you are using PG 9.1, you should use version 0.9.X version (`git checkout v0.9.3`)
 NOTE: If you are using PG 9.2, you should use version 1.0.X version (`git checkout v01.0.1`)
 
+NOTE: If you are using Neo4j 1.7 drivers, you should use version 1.1.X version (`git checkout v01.1.2`)
+NOTE: If you are using Neo4j 4.X drivers, you should use version 1.2.X version (`git checkout v01.2`)
+         Also, Neo4j 4.X drivers require python >= 3.5
+
 ----
 $> cd /tmp
 $> git clone git://github.com/Kozea/Multicorn.git

neo4jPg/neo4jfdw.py

@@ -7,6 +7,7 @@
 from multicorn import ForeignDataWrapper, Qual, ANY, ALL
 from multicorn.utils import log_to_postgres, ERROR, WARNING, DEBUG, INFO
 from neo4j import GraphDatabase, basic_auth, CypherError
+import neotime
 
 class Neo4jForeignDataWrapper(ForeignDataWrapper):
     """
@@ -283,10 +284,24 @@ def compute_table_stat(self):
     def convert_to_pg(self, column, value):
         """
         Convert a value to a PG type.
-        We do nothing for now, but can be usefull for the futur
+        Most work implicitly, but neoTime.Time needs a helping hand when TimeZones are involved
         """
-        #log_to_postgres('Convert column:' + unicode(column), DEBUG)
-        return value
+        #log_to_postgres('Convert column:' + str(column), DEBUG)
+        result = value
+
+        # we want a time with timezone
+        if column.type_name == 'time with time zone':
+            if isinstance(value, neotime.Time):
+                try:
+                    tz = value.tzinfo         # Take TimeZone directly, since str(neotime.Time) does not expose this
+                    if value.tzinfo is None :
+                        tz = pytz.utc
+                    parsed = parser.parse(str(value))
+                    result = datetime.time(parsed.hour, parsed.minute, parsed.second, parsed.microsecond, tz)
+
+                except ValueError as e:
+                    log_to_postgres('Value ' + str(value) + ' of type ' + str(type(value)) + ' can not be compared with a time field => ' +  str(e), ERROR)
+        return result
 
     def convert_to_neo4j(self, column, value):
         """

scripts/docker/postgres/Dockerfile

@@ -10,29 +10,14 @@ COPY . /neo4j-fdw/source
 RUN apt-get update \
       && apt-get install -y --no-install-recommends \
            build-essential \
+           postgresql-server-dev-10 \
            python-dev \
            python-setuptools \
            python-dev \
            python-pip \
+           postgresql-plpython-10 \
            git \
-           libfaketime \
-           wget \
       && rm -rf /var/lib/apt/lists/*
 
-RUN cp /neo4j-fdw/source/scripts/faketime.sh /docker-entrypoint-initdb.d/
-
-RUN mkdir /tmp/pgdebs \
-      && wget --quiet -P /tmp/pgdebs \
-              https://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-server-dev-10_10.10-1.pgdg90%2B1_amd64.deb \
-              https://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-plpython-10_10.10-1.pgdg90%2B1_amd64.deb \
-              https://atalia.postgresql.org/morgue/p/postgresql-10/libpq5_10.10-1.pgdg90%2B1_amd64.deb \
-              https://atalia.postgresql.org/morgue/p/postgresql-10/libpq-dev_10.10-1.pgdg90%2B1_amd64.deb \
-      && apt install -y --allow-downgrades \
-              /tmp/pgdebs/postgresql-server-dev-10_10.10-1.pgdg90+1_amd64.deb \
-              /tmp/pgdebs/postgresql-plpython-10_10.10-1.pgdg90+1_amd64.deb \
-              /tmp/pgdebs/libpq5_10.10-1.pgdg90+1_amd64.deb \
-              /tmp/pgdebs/libpq-dev_10.10-1.pgdg90+1_amd64.deb
-RUN rm -r /tmp/pgdebs
-
 RUN ["chmod", "+x", "/neo4j-fdw/source/scripts/docker/postgres/init.sh"]
 RUN /neo4j-fdw/source/scripts/docker/postgres/init.sh

scripts/docker/postgres/init.sh

@@ -8,9 +8,11 @@ if [ ! -d "/Multicorn" ]; then
 fi
 cd Multicorn
 git checkout tags/v1.3.4
-make && make install
+make PYTHON_OVERRIDE=python2.7 && make PYTHON_OVERRIDE=python2.7 install
+
 
 # Install neo4j fdw
 echo "~~~~~~~~~~~~~ Installing Neo4j FDW"
 cd /neo4j-fdw/source/
-make install
+make PYTHON=python2.7 install
+

scripts/faketime.sh

@@ -8,5 +8,5 @@
       author_email     = neo4jPg.__email__,
       url              = neo4jPg.__url__,
       packages         = find_packages(),
-      install_requires = [ 'neo4j-driver', 'python-dateutil' ]
+      install_requires = [ 'neo4j-driver>=1.7,<2.0','neobolt==1.7.16', 'python-dateutil' ]
 )

setup.py

@@ -9,11 +9,11 @@ my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_date = (DATE '1983-03-26');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_date < (DATE '1983-03-27');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_date > (TIMESTAMP '1983-03-26 12:45:30');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
@@ -23,7 +23,7 @@ my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_date < (TIMESTAMP '1983-03-27 12:45:30');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_date > (TIMESTAMPTZ '1983-03-26 12:45:30+01');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
@@ -33,30 +33,30 @@ my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_date < (TIMESTAMPTZ '1983-03-27 12:45:30+01');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_date < (TIMESTAMPTZ '1983-03-26 20:45:30-05');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 /* Datetime without TZ comparisons */
 SELECT * FROM temporal WHERE temporal.my_localdatetime > (DATE '1983-03-26');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_localdatetime < (DATE '1983-03-27');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_localdatetime < now();
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_localdatetime < (TIMESTAMP '1983-03-26 12:45:30');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_localdatetime < (TIMESTAMP '1983-03-26 12:45:31');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_localdatetime < (TIMESTAMPTZ '1983-03-26 12:45:30+01');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
@@ -67,26 +67,26 @@ my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 /* Datetime with TZ comparisons */
 SELECT * FROM temporal WHERE temporal.my_datetime > (DATE '1983-03-26');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_datetime < (DATE '1983-03-26');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_datetime < now();
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_datetime < (TIMESTAMP '1983-03-26 12:45:30');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_datetime < (TIMESTAMPTZ '1983-03-26 12:45:30+01');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 /* Time with TZ comparisons */
 SELECT * FROM temporal WHERE temporal.my_localtime = (TIME '12:45:30.25');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-03-26-1983|12:45:30.25|12:45:30.25-07|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
 (1 row)
 SELECT * FROM temporal WHERE temporal.my_localtime < (TIME '12:45:30.25');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
@@ -109,4 +109,5 @@ my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
 (0 rows)
 SELECT * FROM temporal WHERE temporal.my_time < (TIMETZ '13:46:30.25+01');
 my_date|my_localtime|my_time|my_datetime|my_localdatetime|my_duration
-(0 rows)
+03-26-1983|12:45:30.25|12:45:30.25+01|Sat Mar 26 03:45:30.25 1983 PST|Sat Mar 26 12:45:30.25 1983|@ 1 year 2 mons 10 days 12 hours 45 mins 30.25 secs
+(1 row)