Improved DateTime handling.

Author: ioquatix

lib/db/postgres/native/types.rb

@@ -84,9 +84,20 @@ def initialize(name = "TIMESTAMP")
 					attr :name
 
 					def parse(string)
-						if match = string.match(/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)([\+\-].*)?/)
+						if string == '-infinity' || string == 'infinity' || string.nil?
+							return string
+						end
+						
+						if match = string.match(/\A(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+(?:\.\d+)?)([-+]\d\d(?::\d\d)?)?\z/)
 							parts = match.captures
-							parts[6] ||= "UTC"
+							
+							parts[5] = BigDecimal(parts[5])
+							
+							if parts[6].nil?
+								parts[6] = '+00:00'
+							elsif /^[-+]\d\d$/ === parts[6]
+								parts[6] += ':00'
+							end
 
 							return Time.new(*parts)
 						end

test/db/postgres/connection/date_time.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2018-2024, by Samuel Williams.
+
+require 'db/postgres/connection'
+require 'sus/fixtures/async'
+
+ATimestamp = Sus::Shared("a timestamp") do |zone, time, expected|
+	it "can get timestamps with microseconds and timezone" do
+		connection.send_query("SET TIME ZONE '#{zone}'")
+		
+		buffer = String.new
+		buffer << "SELECT "
+		connection.append_literal(time, buffer)
+		buffer << "::TIMESTAMPTZ"
+		
+		connection.send_query buffer
+		
+		result = connection.next_result
+		row = result.to_a.first
+		
+		expect(row.first).to be == expected
+	ensure
+		connection.close
+	end
+end
+
+describe DB::Postgres::Connection do
+	include Sus::Fixtures::Async::ReactorContext
+	
+	let(:connection) {subject.new(**CREDENTIALS)}
+		
+	[{
+		# PG produces: "2022-11-11 12:38:59.123456+00"
+		zone: 'UTC',
+		time: '2022-11-11 23:38:59.123456+11',
+		result: Time.new(2022, 11, 11, 23, 38, BigDecimal('59.123456'), '+11:00'),
+	}, {
+		# PG produces: "2022-11-11 12:38:59+00"
+		zone: 'UTC',
+		time: '2022-11-11 23:38:59+11',
+		result: Time.new(2022, 11, 11, 23, 38, BigDecimal('59'),        '+11:00'),
+	}, {
+		# PG produces: "2022-11-11 23:38:59.123456+00"
+		zone: 'UTC',
+		time: '2022-11-11 23:38:59.123456',
+		result: Time.new(2022, 11, 11, 23, 38, BigDecimal('59.123456'), '+00:00'),
+	}, {
+		# PG produces: "2022-11-11 23:38:59+11"
+		zone: 'Australia/Sydney',
+		time: '2022-11-11 23:38:59',
+		result: Time.new(2022, 11, 11, 23, 38, BigDecimal('59'),        '+11:00'),
+	}, {
+		# PG produces: "2022-11-12 06:08:59.123456+11"
+		zone: 'Australia/Sydney',
+		time: '2022-11-11 23:38:59.123456+04:30',
+		result: Time.new(2022, 11, 11, 23, 38, BigDecimal('59.123456'), '+04:30'),
+	}, {
+		# PG produces: "2000-01-01 05:30:00+05:30"
+		zone: 'Asia/Kolkata',
+		time: '2000-01-01 00:00:00+00',
+		result: Time.new(2000, 1, 1, 5, 30, 0, '+05:30'),
+	}, {
+		# PG produces: "infinity"
+		zone: 'UTC',
+		time: 'infinity',
+		result: 'infinity',
+	}, {
+		# PG produces: "-infinity"
+		zone: 'UTC',
+		time: '-infinity',
+		result: '-infinity',
+	}, {
+		# PG produces: null
+		zone: 'UTC',
+		time: nil,
+		result: nil,
+	}].each do |spec|
+		it_behaves_like ATimestamp, spec[:zone], spec[:time], spec[:result]
+	end
+end