sqlalchemy-risingwave 0.0.9__tar.gz → 1.0.0__tar.gz

{sqlalchemy-risingwave-0.0.9 → sqlalchemy-risingwave-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-risingwave
-Version: 0.0.9
+Version: 1.0.0
 Summary: RisingWave dialect for SQLAlchemy
 Home-page: https://github.com/risingwavelabs/risingwave
 Author: RisingWave Labs
@@ -12,15 +12,21 @@ Keywords: SQLAlchemy RisingWave
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+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.4
 
 # RisingWave dialect for SQLAlchemy
 
+SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. https://www.sqlalchemy.org/
+
+RisingWave is a cloud-native streaming database that uses SQL as the interface language. It is designed to reduce the complexity and cost of building real-time applications. https://www.risingwave.com
+
 ## Prerequisites
 
 For psycopg2 support you must install either:
@@ -65,7 +71,13 @@ 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)
+- [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-0.0.9 → sqlalchemy-risingwave-1.0.0}/README.md

@@ -1,5 +1,9 @@
 # RisingWave dialect for SQLAlchemy
 
+SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. https://www.sqlalchemy.org/
+
+RisingWave is a cloud-native streaming database that uses SQL as the interface language. It is designed to reduce the complexity and cost of building real-time applications. https://www.risingwave.com
+
 ## Prerequisites
 
 For psycopg2 support you must install either:
@@ -44,7 +48,13 @@ 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)
+- [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-0.0.9 → sqlalchemy-risingwave-1.0.0}/setup.py

@@ -23,10 +23,11 @@ setup(
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     keywords="SQLAlchemy RisingWave",
     project_urls={
@@ -35,7 +36,7 @@ setup(
     },
     packages=find_packages(include=["sqlalchemy_risingwave"]),
     include_package_data=True,
-    install_requires=["SQLAlchemy"],
+    install_requires=["SQLAlchemy>=1.4,<2"],
     zip_safe=False,
     # # Do not support dialects now.
     entry_points={

sqlalchemy-risingwave-1.0.0/sqlalchemy_risingwave/__init__.py

@@ -0,0 +1,16 @@
+from sqlalchemy.dialects import registry as _registry
+
+__version__ = "1.0.0"
+
+_registry.register(
+    "risingwave.psycopg2",
+    "sqlalchemy_risingwave.psycopg2",
+    "RisingWaveDialect_psycopg2",
+)
+
+# asyncpg is not supported yet
+# _registry.register(
+#     "risingwave.asyncpg",
+#     "sqlalchemy_risingwave.asyncpg",
+#     "RisingWaveDialect_asyncpg",
+# )

{sqlalchemy-risingwave-0.0.9 → sqlalchemy-risingwave-1.0.0}/sqlalchemy_risingwave/base.py

@@ -4,27 +4,42 @@ from sqlalchemy.dialects.postgresql.base import PGDialect
 from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
 from sqlalchemy import text
 from sqlalchemy.util import warn
-from sqlalchemy.dialects.postgresql import INET
-from sqlalchemy.dialects.postgresql import UUID
 
 import sqlalchemy.types as sqltypes
+
 _type_map = {
+    "bool": sqltypes.BOOLEAN,  # DataType::Boolean
     "boolean": sqltypes.BOOLEAN,  # DataType::Boolean
     "smallint": sqltypes.SMALLINT,  # DataType::Int16
+    "int2": sqltypes.SMALLINT,  # DataType::Int16
     "integer": sqltypes.INT,  # DataType::Int32
+    "int4": sqltypes.INT,  # DataType::Int32
     "bigint": sqltypes.BIGINT,  # DataType::Int64
+    "int8": sqltypes.BIGINT,  # DataType::Int64
     "real": sqltypes.FLOAT,  # DataType::Float32
+    "float4": sqltypes.FLOAT,  # DataType::Float32
     "double precision": sqltypes.FLOAT,  # DataType::Float64
+    "float8": sqltypes.FLOAT,  # DataType::Float64
     "numeric": sqltypes.DECIMAL,  # DataType::Decimal
+    "decimal": sqltypes.DECIMAL,  # DataType::Decimal
     "date": sqltypes.DATE,  # DataType::Date
     "varchar": sqltypes.VARCHAR,  # DataType::Varchar
+    "character varying": sqltypes.VARCHAR,  # DataType::Varchar
+    "time": sqltypes.Time,  # DataType::Time
     "time without time zone": sqltypes.Time,  # DataType::Time
+    "timestamp": sqltypes.TIMESTAMP,  # DataType::Timestamp
     "timestamp without time zone": sqltypes.TIMESTAMP,  # DataType::Timestamp
+    "timestamptz": sqltypes.TIMESTAMP,  # DataType::Timestampz
     "timestamp with time zone": sqltypes.TIMESTAMP,  # DataType::Timestampz
     "interval": sqltypes.Interval,  # DataType::Interval
+    "bytea": sqltypes.BLOB,
+    "jsonb": sqltypes.JSON,
 }
 
 
+# Unsupported: Int256, Serial, Struct, List
+
+
 class RisingWaveDialect(PGDialect_psycopg2):
     name = "risingwave"
 
@@ -45,28 +60,24 @@ class RisingWaveDialect(PGDialect_psycopg2):
         return (9, 5, 0)
 
     def get_table_names(self, conn, schema=None, **kw):
-        sql = (
-            "SELECT table_name FROM information_schema.tables WHERE "
-            "table_schema = :table_schema"
-        )
-        rows = conn.execute(
-            text(sql),
-            {"table_schema": schema or self.default_schema_name},
-        )
-        return [row.table_name for row in rows]
+        sql = "SELECT tablename FROM pg_tables"
+        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'"
+        rows = conn.execute(text(sql))
+        return [row.tablename for row in rows]
 
     def get_view_names(self, conn, schema=None, **kw):
-        sql = (
-            "select * from pg_catalog.pg_views"
-        )
-        rows = conn.execute(
-            text(sql),
-            {"table_schema": schema or self.default_schema_name},
-        )
-
+        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'"
+        rows = conn.execute(text(sql))
         return [row.viewname for row in rows]
 
-    def has_table(self, conn, table, schema=None):
+    def has_table(self, conn, table, schema=None, **kw):
         return any(t == table for t in self.get_table_names(conn, schema=schema))
 
     def get_columns(self, conn, table_name, schema=None, **kw):
@@ -142,7 +153,7 @@ class RisingWaveDialect(PGDialect_psycopg2):
 
         indexes = {}
         for row in rows:
-            if not row.relname in indexes:
+            if row.relname not in indexes:
                 indexes[row.relname] = []
             indexes[row.relname].append(row.attname)
 
@@ -161,7 +172,7 @@ class RisingWaveDialect(PGDialect_psycopg2):
         raise []
 
     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-0.0.9 → sqlalchemy-risingwave-1.0.0}/sqlalchemy_risingwave.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-risingwave
-Version: 0.0.9
+Version: 1.0.0
 Summary: RisingWave dialect for SQLAlchemy
 Home-page: https://github.com/risingwavelabs/risingwave
 Author: RisingWave Labs
@@ -12,15 +12,21 @@ Keywords: SQLAlchemy RisingWave
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+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.4
 
 # RisingWave dialect for SQLAlchemy
 
+SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. https://www.sqlalchemy.org/
+
+RisingWave is a cloud-native streaming database that uses SQL as the interface language. It is designed to reduce the complexity and cost of building real-time applications. https://www.risingwave.com
+
 ## Prerequisites
 
 For psycopg2 support you must install either:
@@ -65,7 +71,13 @@ 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)
+- [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.0.0/sqlalchemy_risingwave.egg-info/requires.txt

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

{sqlalchemy-risingwave-0.0.9 → sqlalchemy-risingwave-1.0.0}/test/test_schema.py

@@ -7,11 +7,11 @@ class SchemaTest(fixtures.TestBase):
 
     def teardown_method(self, method):
         with testing.db.begin() as conn:
-            conn.execute("DROP TABLE IF EXISTS users")
+            conn.execute(text("DROP TABLE IF EXISTS users"))
 
     def setup_method(self):
         with testing.db.begin() as conn:
-            conn.execute("CREATE TABLE users (name STRING PRIMARY KEY)")
+            conn.execute(text("CREATE TABLE users (name STRING PRIMARY KEY)"))
         self.meta = MetaData(schema="public")
 
     def test_get_columns_indexes_across_schema(self):
@@ -19,38 +19,36 @@ class SchemaTest(fixtures.TestBase):
         # across schema table must use schema.table
         Table("users", self.meta, autoload_with=testing.db, schema="public")
 
-    def test_returning_clause(self):
+    def test_has_table(self):
         with testing.db.begin() as conn:
             insp = inspect(testing.db)
-            table_names = insp.get_table_names()
-
-            for t in table_names:
-                assert t == str("users")
+            assert insp.has_table(table_name="users", schema="public")
 
     def test_get_indexes(self):
         with testing.db.begin() as conn:
-            conn.execute("CREATE TABLE three_columns (id1 INT, id2 INT, id3 INT)")
-            conn.execute("CREATE INDEX three_columns_idx ON three_columns(id2) INCLUDE(id1)")
+            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)"))
 
             insp = inspect(testing.db)
             indexes = insp.get_indexes("three_columns")
 
             assert len(indexes) == 1
             assert indexes[0]["name"] == "three_columns_idx"
-            assert indexes[0]["column_names"] == ["id2", "id1"]
+            # pg will return `"id2", "id1"`
+            assert indexes[0]["column_names"] == ["id2"]
 
-            conn.execute("DROP TABLE three_columns")
+            conn.execute(text("DROP TABLE three_columns"))
 
     def test_get_view_names(self):
         with testing.db.begin() as conn:
-            conn.execute("CREATE TABLE three_columns (id1 INT, id2 INT, id3 INT)")
-            conn.execute("CREATE VIEW three_view AS SELECT * from three_columns")
+            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"))
 
             insp = inspect(testing.db)
-            indexes = insp.get_view_names()
+            views = insp.get_view_names()
 
-            assert len(indexes) == 1
-            assert indexes[0] == "three_view"
+            assert len(views) == 1
+            assert views[0] == "three_view"
 
-            conn.execute("DROP VIEW three_view")
-            conn.execute("DROP TABLE three_columns")
+            conn.execute(text("DROP VIEW three_view"))
+            conn.execute(text("DROP TABLE three_columns"))

sqlalchemy-risingwave-0.0.9/sqlalchemy_risingwave/__init__.py

@@ -1,14 +0,0 @@
-from sqlalchemy.dialects import registry as _registry
-
-__version__ = "0.0.9"
-
-_registry.register(
-    "risingwave.psycopg2",
-    "sqlalchemy_risingwave.psycopg2",
-    "RisingWaveDialect_psycopg2",
-)
-_registry.register(
-    "risingwave.asyncpg",
-    "sqlalchemy_risingwave.asyncpg",
-    "RisingWaveDialect_asyncpg",
-)

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

@@ -1 +0,0 @@
-SQLAlchemy