sqlalchemy-risingwave 1.1.0__tar.gz → 1.4.0__tar.gz

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sqlalchemy-risingwave
-Version: 1.1.0
+Version: 1.4.0
 Summary: RisingWave dialect for SQLAlchemy
 Home-page: https://github.com/risingwavelabs/risingwave
 Author: RisingWave Labs
@@ -19,7 +19,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: SQLAlchemy<2.1,>=2.0
+Requires-Dist: SQLAlchemy<2.0,>=1.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 # RisingWave dialect for SQLAlchemy
 
@@ -39,7 +50,7 @@ For psycopg2 support you must install either:
 
 (The binary package is a practical choice for development and testing but in
 production it is advised to use the package built from sources.)
- 
+
 ## Install
 Install via [PyPI](https://pypi.org/project/sqlalchemy-risingwave/)
 ```
@@ -73,11 +84,7 @@ pytest # to run the test
 ## Ref
 
 - [Sqlalchemy dialects doc](https://github.com/sqlalchemy/sqlalchemy/blob/main/README.dialects.rst)
-
 - [CocoroachDB sqlalchemy](https://github.com/cockroachdb/sqlalchemy-cockroachdb)
-
 - [RisingWave: Open-Source Streaming Database](https://www.risingwave.com/database/)
-
 - [RisingWave Cloud](https://www.risingwave.com/cloud/)
-
 - [What is RisingWave?](https://docs.risingwave.com/docs/current/intro/)

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/README.md

@@ -16,7 +16,7 @@ For psycopg2 support you must install either:
 
 (The binary package is a practical choice for development and testing but in
 production it is advised to use the package built from sources.)
- 
+
 ## Install
 Install via [PyPI](https://pypi.org/project/sqlalchemy-risingwave/)
 ```
@@ -50,11 +50,7 @@ pytest # to run the test
 ## Ref
 
 - [Sqlalchemy dialects doc](https://github.com/sqlalchemy/sqlalchemy/blob/main/README.dialects.rst)
-
 - [CocoroachDB sqlalchemy](https://github.com/cockroachdb/sqlalchemy-cockroachdb)
-
 - [RisingWave: Open-Source Streaming Database](https://www.risingwave.com/database/)
-
 - [RisingWave Cloud](https://www.risingwave.com/cloud/)
-
 - [What is RisingWave?](https://docs.risingwave.com/docs/current/intro/)

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/setup.py

@@ -36,7 +36,7 @@ setup(
     },
     packages=find_packages(include=["sqlalchemy_risingwave"]),
     include_package_data=True,
-    install_requires=["SQLAlchemy>=2.0,<2.1"],
+    install_requires=["SQLAlchemy>=1.4,<2.0"],
     zip_safe=False,
     # # Do not support dialects now.
     entry_points={

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/sqlalchemy_risingwave/__init__.py

@@ -1,6 +1,6 @@
 from sqlalchemy.dialects import registry as _registry
 
-__version__ = "1.1.0"
+__version__ = "1.4.0"
 
 _registry.register(
     "risingwave.psycopg2",

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/sqlalchemy_risingwave/base.py

@@ -7,6 +7,7 @@ from sqlalchemy.util import warn
 
 from sqlalchemy import util
 import sqlalchemy.types as sqltypes
+import sqlalchemy.exc as exc
 
 _type_map = {
     "bool": sqltypes.BOOLEAN,  # DataType::Boolean
@@ -69,13 +70,30 @@ class RisingWaveDialect(PGDialect_psycopg2):
         rows = conn.execute(text(sql))
         return [row.tablename for row in rows]
 
-    def get_view_names(self, conn, schema=None, **kw):
-        sql = "SELECT viewname FROM pg_views"
-        if schema is not None:
-            sql += f" WHERE schemaname = '{schema or self.default_schema_name}'"
-        else:
-            sql += " WHERE schemaname <> 'rw_catalog' and schemaname <> 'pg_catalog' and schemaname <> 'information_schema'"
-        views = conn.execute(text(sql))
+    def get_view_names(self, conn, schema=None, include=("plain", "materialized"),  **kw):
+        base_queries = [
+            "SELECT viewname FROM pg_views",
+            "SELECT matviewname as viewname FROM pg_matviews",
+        ]
+        if not include:
+            raise ValueError(
+                "empty include, needs to be a sequence containing "
+                "one or both of 'plain' and 'materialized'"
+            )
+        include_queries = []
+        if "plain" in include:
+            include_queries.append(base_queries[0])
+        if "materialized" in include:
+            include_queries.append(base_queries[1])
+
+        queries = []
+        for sql in include_queries:
+            if schema is not None:
+                sql += f" WHERE schemaname = '{schema or self.default_schema_name}'"
+            else:
+                sql += " WHERE schemaname <> 'rw_catalog' and schemaname <> 'pg_catalog' and schemaname <> 'information_schema'"
+            queries.append(sql)
+        views = conn.execute(text(" UNION ".join(queries)))
 
         # As sqlalchmey has no support for Sources, we categorize as view temporarily.
         source_sql = f"SELECT rw_catalog.rw_sources.name as source_name FROM rw_catalog.rw_sources JOIN rw_catalog.rw_schemas ON rw_catalog.rw_sources.schema_id = rw_catalog.rw_schemas.id"
@@ -84,7 +102,10 @@ class RisingWaveDialect(PGDialect_psycopg2):
         else:
             source_sql += " WHERE rw_catalog.rw_schemas.name <> 'rw_catalog' and rw_catalog.rw_schemas.name <> 'pg_catalog' and rw_catalog.rw_schemas.name <> 'information_schema'"
         sources = conn.execute(text(source_sql))
-        return [view.viewname for view in views] + [source.source_name for source in sources]
+
+        return [view.viewname for view in views] + [
+            source.source_name for source in sources
+        ]
 
     def has_table(self, conn, table, schema=None, **kw):
         return any(t == table for t in self.get_table_names(conn, schema=schema))
@@ -96,7 +117,10 @@ class RisingWaveDialect(PGDialect_psycopg2):
         )
         rows = conn.execute(
             text(sql),
-            {"table_schema": schema or self.default_schema_name, "table_name": table_name},
+            {
+                "table_schema": schema or self.default_schema_name,
+                "table_name": table_name,
+            },
         )
 
         res = []
@@ -138,6 +162,7 @@ class RisingWaveDialect(PGDialect_psycopg2):
             column_info = dict(
                 name=name,
                 type=type_class,
+                nullable = True,
             )
 
             res.append(column_info)
@@ -149,8 +174,8 @@ class RisingWaveDialect(PGDialect_psycopg2):
             schema_where_clause = "n.nspname = :schema"
         else:
             schema_where_clause = "pg_catalog.pg_table_is_visible(r.id)"
-        query = (
-                """
+        sql = (
+            """
                 SELECT r.id as oid
                 FROM rw_catalog.rw_relations r
                 LEFT JOIN pg_catalog.pg_namespace n ON n.oid = r.schema_id
@@ -158,18 +183,12 @@ class RisingWaveDialect(PGDialect_psycopg2):
                 AND r.name = :table_name AND r.relation_type in
                 ('table', 'system table', 'view', 'materialized view', 'source', 'sink')
             """
-                % schema_where_clause
+            % schema_where_clause
+        )
+        s = text(sql).columns(oid=sqltypes.Integer)
+        c = connection.execute(
+            s, {"table_name": str(table_name), "schema": str(schema)}
         )
-        # Since we're binding to unicode, table_name and schema_name must be
-        # unicode.
-        table_name = util.text_type(table_name)
-        if schema is not None:
-            schema = util.text_type(schema)
-        s = text(query).bindparams(table_name=sqltypes.Unicode)
-        s = s.columns(oid=sqltypes.Integer)
-        if schema:
-            s = s.bindparams(sql.bindparam("schema", type_=sqltypes.Unicode))
-        c = connection.execute(s, dict(table_name=table_name, schema=schema))
         table_oid = c.scalar()
         if table_oid is None:
             raise exc.NoSuchTableError(table_name)
@@ -210,10 +229,15 @@ class RisingWaveDialect(PGDialect_psycopg2):
         return res
 
     def get_foreign_keys_v1(self, conn, table_name, schema=None, **kw):
-        raise []
+        return []
 
     def get_foreign_keys(
-            self, connection, table_name, schema=None, postgresql_ignore_search_path=False, **kw
+        self,
+        connection,
+        table_name,
+        schema=None,
+        postgresql_ignore_search_path=False,
+        **kw,
     ):
         return []
 

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/sqlalchemy_risingwave.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sqlalchemy-risingwave
-Version: 1.1.0
+Version: 1.4.0
 Summary: RisingWave dialect for SQLAlchemy
 Home-page: https://github.com/risingwavelabs/risingwave
 Author: RisingWave Labs
@@ -19,7 +19,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: SQLAlchemy<2.1,>=2.0
+Requires-Dist: SQLAlchemy<2.0,>=1.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 # RisingWave dialect for SQLAlchemy
 
@@ -39,7 +50,7 @@ For psycopg2 support you must install either:
 
 (The binary package is a practical choice for development and testing but in
 production it is advised to use the package built from sources.)
- 
+
 ## Install
 Install via [PyPI](https://pypi.org/project/sqlalchemy-risingwave/)
 ```
@@ -73,11 +84,7 @@ pytest # to run the test
 ## Ref
 
 - [Sqlalchemy dialects doc](https://github.com/sqlalchemy/sqlalchemy/blob/main/README.dialects.rst)
-
 - [CocoroachDB sqlalchemy](https://github.com/cockroachdb/sqlalchemy-cockroachdb)
-
 - [RisingWave: Open-Source Streaming Database](https://www.risingwave.com/database/)
-
 - [RisingWave Cloud](https://www.risingwave.com/cloud/)
-
 - [What is RisingWave?](https://docs.risingwave.com/docs/current/intro/)

sqlalchemy_risingwave-1.4.0/sqlalchemy_risingwave.egg-info/requires.txt

@@ -0,0 +1 @@
+SQLAlchemy<2.0,>=1.4

{sqlalchemy-risingwave-1.1.0 → sqlalchemy_risingwave-1.4.0}/test/test_schema.py

@@ -26,29 +26,43 @@ class SchemaTest(fixtures.TestBase):
 
     def test_get_indexes(self):
         with testing.db.begin() as conn:
-            conn.execute(text("CREATE TABLE three_columns (id1 INT, id2 INT, id3 INT)"))
-            conn.execute(text("CREATE INDEX three_columns_idx ON three_columns(id2) INCLUDE(id1)"))
+            conn.execute(text("CREATE TABLE t (id1 INT, id2 INT, id3 INT)"))
+            conn.execute(text("CREATE INDEX idx ON t(id2) INCLUDE(id1)"))
 
             insp = inspect(testing.db)
-            indexes = insp.get_indexes("three_columns")
+            indexes = insp.get_indexes("t")
 
             assert len(indexes) == 1
-            assert indexes[0]["name"] == "three_columns_idx"
-            # pg will return `"id2", "id1"`
-            assert indexes[0]["column_names"] == ["id2"]
+            assert indexes[0]["name"] == "idx"
+            assert indexes[0]["column_names"] == ["id2", "id1"]
 
-            conn.execute(text("DROP TABLE three_columns"))
+            conn.execute(text("DROP TABLE t"))
 
     def test_get_view_names(self):
         with testing.db.begin() as conn:
-            conn.execute(text("CREATE TABLE three_columns (id1 INT, id2 INT, id3 INT)"))
-            conn.execute(text("CREATE VIEW three_view AS SELECT * from three_columns"))
+            conn.execute(text("CREATE TABLE t (id1 INT, id2 INT, id3 INT)"))
+            conn.execute(text("CREATE VIEW v AS SELECT * from t"))
+            conn.execute(text("CREATE MATERIALIZED VIEW mv AS SELECT * FROM t"))
 
             insp = inspect(testing.db)
             views = insp.get_view_names()
 
+            assert len(views) == 2
+            assert "v" in views
+            assert "mv" in views
+
+            insp = inspect(testing.db)
+            views = insp.get_view_names(include = ("plain"))
+
+            assert len(views) == 1
+            assert "v" in views
+
+            insp = inspect(testing.db)
+            views = insp.get_view_names(include = ("materialized"))
+
             assert len(views) == 1
-            assert views[0] == "three_view"
+            assert "mv" in views
 
-            conn.execute(text("DROP VIEW three_view"))
-            conn.execute(text("DROP TABLE three_columns"))
+            conn.execute(text("DROP MATERIALIZED VIEW mv"))
+            conn.execute(text("DROP VIEW v"))
+            conn.execute(text("DROP TABLE t"))

sqlalchemy-risingwave-1.1.0/sqlalchemy_risingwave.egg-info/requires.txt

@@ -1 +0,0 @@
-SQLAlchemy<2.1,>=2.0