Changeset: c6164da1961d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6164da1961d
Modified Files:
clients/python2/monetdb/mapi.py
clients/python3/monetdb/mapi.py
clients/ruby/lib/MonetDBConnection.rb
Branch: Jul2015
Log Message:
merged
diffs (50 lines):
diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py
--- a/clients/python2/monetdb/mapi.py
+++ b/clients/python2/monetdb/mapi.py
@@ -142,8 +142,9 @@ class Connection(object):
logger.info("redirect to monetdb://%s:%s/%s" %
(self.hostname, self.port, self.database))
self.socket.close()
- self.connect(self.hostname, self.port, self.username,
- self.password, self.database, self.language)
+ self.connect(hostname=self.hostname, port=self.port,
+ username=self.username, password=self.password,
+ database=self.database, language=self.language)
else:
raise ProgrammingError("unknown redirect: %s" % prompt)
diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py
--- a/clients/python3/monetdb/mapi.py
+++ b/clients/python3/monetdb/mapi.py
@@ -143,8 +143,9 @@ class Connection(object):
logger.info("redirect to monetdb://%s:%s/%s" %
(self.hostname, self.port, self.database))
self.socket.close()
- self.connect(self.hostname, self.port, self.username,
- self.password, self.database, self.language)
+ self.connect(hostname=self.hostname, port=self.port,
+ username=self.username, password=self.password,
+ database=self.database, language=self.language)
else:
raise ProgrammingError("unknown redirect: %s" % prompt)
diff --git a/clients/ruby/lib/MonetDBConnection.rb
b/clients/ruby/lib/MonetDBConnection.rb
--- a/clients/ruby/lib/MonetDBConnection.rb
+++ b/clients/ruby/lib/MonetDBConnection.rb
@@ -398,8 +398,14 @@ class MonetDBConnection
def set_timezone()
tz = Time.new
tz_offset = tz.gmt_offset / @@HOUR
-
- if tz_offset <= 9 # verify minute count!
+
+ # verify minute count!
+ if tz_offset <= -10
+ tz_offset = "'" + tz_offset.to_s + ":00'"
+ elsif tz_offset < 0
+ tz_offset = -tz_offset
+ tz_offset = "'-0" + tz_offset.to_s + ":00'"
+ elsif tz_offset <= 9
tz_offset = "'+0" + tz_offset.to_s + ":00'"
else
tz_offset = "'+" + tz_offset.to_s + ":00'"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
