test: add system test + fix conformance 1.3 test

Author: olavloite

google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py

@@ -410,7 +410,9 @@ def get_column_specification(self, column, **kwargs):
             colspec += " NOT NULL"
 
         has_identity = (
-            column.identity is not None and self.dialect.supports_identity_columns
+            hasattr(column, "identity")
+            and column.identity is not None
+            and self.dialect.supports_identity_columns
         )
         default = self.get_column_default_string(column)
 

test/mockserver_tests/test_auto_increment.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC All rights reserved.
+# Copyright 2025 Google LLC All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -62,6 +62,65 @@ def test_create_table(self):
             requests[0].statements[0],
         )
 
+    def test_create_auto_increment_table(self):
+        from test.mockserver_tests.auto_increment_model import Base
+
+        add_result(
+            """SELECT true
+FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA="" AND TABLE_NAME="singers"
+LIMIT 1
+""",
+            ResultSet(),
+        )
+        engine = create_engine(
+            "spanner:///projects/p/instances/i/databases/d",
+            connect_args={"client": self.client, "pool": FixedSizePool(size=10)},
+        )
+        engine.dialect.use_auto_increment = True
+        Base.metadata.create_all(engine)
+        requests = self.database_admin_service.requests
+        eq_(1, len(requests))
+        is_instance_of(requests[0], UpdateDatabaseDdlRequest)
+        eq_(1, len(requests[0].statements))
+        eq_(
+            "CREATE TABLE singers (\n"
+            "\tid INT64 NOT NULL AUTO_INCREMENT, \n"
+            "\tname STRING(MAX) NOT NULL\n"
+            ") PRIMARY KEY (id)",
+            requests[0].statements[0],
+        )
+
+    def test_create_table_with_specific_sequence_kind(self):
+        from test.mockserver_tests.auto_increment_model import Base
+
+        add_result(
+            """SELECT true
+FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA="" AND TABLE_NAME="singers"
+LIMIT 1
+""",
+            ResultSet(),
+        )
+        engine = create_engine(
+            "spanner:///projects/p/instances/i/databases/d",
+            connect_args={"client": self.client, "pool": FixedSizePool(size=10)},
+        )
+        engine.dialect.default_sequence_kind = "non_existing_kind"
+        Base.metadata.create_all(engine)
+        requests = self.database_admin_service.requests
+        eq_(1, len(requests))
+        is_instance_of(requests[0], UpdateDatabaseDdlRequest)
+        eq_(1, len(requests[0].statements))
+        eq_(
+            "CREATE TABLE singers (\n"
+            "\tid INT64 NOT NULL "
+            "GENERATED BY DEFAULT AS IDENTITY (non_existing_kind), \n"
+            "\tname STRING(MAX) NOT NULL\n"
+            ") PRIMARY KEY (id)",
+            requests[0].statements[0],
+        )
+
     def test_insert_row(self):
         from test.mockserver_tests.auto_increment_model import Singer
 

test/system/test_basics.py

@@ -24,10 +24,11 @@
     MetaData,
     Boolean,
     BIGINT,
+    select,
 )
 from sqlalchemy.orm import Session, DeclarativeBase, Mapped, mapped_column
 from sqlalchemy.types import REAL
-from sqlalchemy.testing import eq_
+from sqlalchemy.testing import eq_, is_true
 from sqlalchemy.testing.plugin.plugin_base import fixtures
 
 
@@ -50,6 +51,12 @@ def define_tables(cls, metadata):
             numbers.c.prime.desc(),
             spanner_storing=[numbers.c.alternative_name],
         )
+        Table(
+            "users",
+            metadata,
+            Column("ID", Integer, primary_key=True),
+            Column("name", String(20)),
+        )
 
     def test_hello_world(self, connection):
         greeting = connection.execute(text("select 'Hello World'"))
@@ -69,7 +76,7 @@ def test_reflect(self, connection):
         engine = connection.engine
         meta: MetaData = MetaData()
         meta.reflect(bind=engine)
-        eq_(1, len(meta.tables))
+        eq_(2, len(meta.tables))
         table = meta.tables["numbers"]
         eq_(5, len(table.columns))
         eq_("number", table.columns[0].name)
@@ -127,10 +134,25 @@ class Number(Base):
             prime: Mapped[bool] = mapped_column(Boolean)
             ln: Mapped[float] = mapped_column(REAL)
 
+        class User(Base):
+            __tablename__ = "users"
+            ID: Mapped[int] = mapped_column(primary_key=True)
+            name: Mapped[str] = mapped_column(String(20))
+
         engine = connection.engine
         with Session(engine) as session:
             number = Number(
                 number=1, name="One", alternative_name="Uno", prime=False, ln=0.0
             )
             session.add(number)
             session.commit()
+
+        with Session(engine) as session:
+            user = User(name="Test")
+            session.add(user)
+            session.commit()
+
+            statement = select(User).filter_by(name="Test")
+            users = session.scalars(statement).all()
+            eq_(1, len(users))
+            is_true(users[0].ID > 0)