fix: map now() to current_timestamp (#540)

Fixes #497

Author: olavloite

google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py

@@ -235,6 +235,9 @@ def get_from_hint_text(self, _, text):
         """
         return text
 
+    def visit_now_func(self, func, **kwargs):
+        return "current_timestamp"
+
     def visit_empty_set_expr(self, type_, **kw):
         """Return an empty set expression of the given type.
 

test/mockserver_tests/mock_server_test_base.py

@@ -22,6 +22,7 @@
     Client,
     ResultSet,
     PingingPool,
+    TypeCode,
 )
 from google.cloud.spanner_v1.database import Database
 from google.cloud.spanner_v1.instance import Instance
@@ -48,6 +49,12 @@ def add_update_count(
 
 
 def add_select1_result():
+    add_single_result("select 1", "c", TypeCode.INT64, [("1",)])
+
+
+def add_single_result(
+    sql: str, column_name: str, type_code: spanner_type.TypeCode, row
+):
     result = result_set.ResultSet(
         dict(
             metadata=result_set.ResultSetMetadata(
@@ -57,10 +64,8 @@ def add_select1_result():
                             fields=[
                                 spanner_type.StructType.Field(
                                     dict(
-                                        name="c",
-                                        type=spanner_type.Type(
-                                            dict(code=spanner_type.TypeCode.INT64)
-                                        ),
+                                        name=column_name,
+                                        type=spanner_type.Type(dict(code=type_code)),
                                     )
                                 )
                             ]
@@ -70,8 +75,8 @@ def add_select1_result():
             ),
         )
     )
-    result.rows.extend(["1"])
-    MockServerTestBase.spanner_service.mock_spanner.add_result("select 1", result)
+    result.rows.extend(row)
+    MockServerTestBase.spanner_service.mock_spanner.add_result(sql, result)
 
 
 class MockServerTestBase(fixtures.TestBase):

test/mockserver_tests/test_basics.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import datetime
 from google.cloud.spanner_admin_database_v1 import UpdateDatabaseDdlRequest
 from google.cloud.spanner_dbapi.parsed_statement import AutocommitDmlMode
 from sqlalchemy import (
@@ -22,6 +23,7 @@
     Column,
     Integer,
     String,
+    func,
     text,
 )
 from sqlalchemy.testing import eq_, is_instance_of
@@ -31,11 +33,13 @@
     ExecuteSqlRequest,
     ResultSet,
     PingingPool,
+    TypeCode,
 )
 from test.mockserver_tests.mock_server_test_base import (
     MockServerTestBase,
     add_select1_result,
     add_result,
+    add_single_result,
     add_update_count,
 )
 
@@ -70,6 +74,25 @@ def test_sqlalchemy_select1(self):
             results = connection.execute(select(1)).fetchall()
             self.verify_select1(results)
 
+    def test_sqlalchemy_select_now(self):
+        now = datetime.datetime.now(datetime.UTC)
+        iso_now = now.isoformat().replace("+00:00", "Z")
+        add_single_result(
+            "SELECT current_timestamp AS now_1",
+            "now_1",
+            TypeCode.TIMESTAMP,
+            [(iso_now,)],
+        )
+        engine = create_engine(
+            "spanner:///projects/p/instances/i/databases/d",
+            connect_args={"client": self.client, "pool": PingingPool(size=10)},
+        )
+        with engine.connect().execution_options(
+            isolation_level="AUTOCOMMIT"
+        ) as connection:
+            spanner_now = connection.execute(select(func.now())).fetchone()[0]
+            eq_(spanner_now.timestamp(), now.timestamp())
+
     def test_create_table(self):
         add_result(
             """SELECT true