Skip to content

Commit f5d614d

Browse files
fix: Rename database from 'couchbasedb' to 'couchbase' in documentation and db_engine_specs (#29911)
1 parent 39209c2 commit f5d614d

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

RESOURCES/INTHEWILD.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Join our growing community!
8080
- [Caizin](https://caizin.com/) [@tejaskatariya]
8181
- [Careem](https://www.careem.com/) [@SamraHanifCareem]
8282
- [Cloudsmith](https://cloudsmith.io) [@alancarson]
83-
- [CnOvit](http://www.cnovit.com/) [@xieshaohu]
83+
- [CnOvit](https://www.cnovit.com/) [@xieshaohu]
8484
- [Cyberhaven](https://www.cyberhaven.com/) [@toliver-ch]
8585
- [Deepomatic](https://deepomatic.com/) [@Zanoellia]
8686
- [Dial Once](https://www.dial-once.com/)

docs/docs/configuration/databases.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ are compatible with Superset.
5454
| [Azure MS SQL](/docs/configuration/databases#sql-server) | `pip install pymssql` | `mssql+pymssql://UserName@presetSQL:[email protected]:1433/TestSchema` |
5555
| [ClickHouse](/docs/configuration/databases#clickhouse) | `pip install clickhouse-connect` | `clickhousedb://{username}:{password}@{hostname}:{port}/{database}` |
5656
| [CockroachDB](/docs/configuration/databases#cockroachdb) | `pip install cockroachdb` | `cockroachdb://root@{hostname}:{port}/{database}?sslmode=disable` |
57-
| [CouchbaseDB](/docs/configuration/databases#couchbaseDB) | `pip install couchbase-sqlalchemy` | `couchbasedb://{username}:{password}@{hostname}:{port}?truststorepath={ssl certificate path}` |
57+
| [Couchbase](/docs/configuration/databases#couchbase) | `pip install couchbase-sqlalchemy` | `couchbase://{username}:{password}@{hostname}:{port}?truststorepath={ssl certificate path}` |
5858
| [Dremio](/docs/configuration/databases#dremio) | `pip install sqlalchemy_dremio` | `dremio://user:pwd@host:31010/` |
5959
| [Elasticsearch](/docs/configuration/databases#elasticsearch) | `pip install elasticsearch-dbapi` | `elasticsearch+http://{user}:{password}@{host}:9200/` |
6060
| [Exasol](/docs/configuration/databases#exasol) | `pip install sqlalchemy-exasol` | `exa+pyodbc://{username}:{password}@{hostname}:{port}/my_schema?CONNECTIONLCALL=en_US.UTF-8&driver=EXAODBC` |
@@ -375,9 +375,10 @@ cockroachdb://root@{hostname}:{port}/{database}?sslmode=disable
375375

376376

377377

378-
#### CouchbaseDB
378+
#### Couchbase
379379

380-
The recommended connector library for CouchbaseDB is
380+
The Couchbase's Superset connection is designed to support two services: Couchbase Analytics and Couchbase Columnar.
381+
The recommended connector library for couchbase is
381382
[couchbase-sqlalchemy](https://github.com/couchbase/couchbase-sqlalchemy).
382383
```
383384
pip install couchbase-sqlalchemy
@@ -386,7 +387,7 @@ pip install couchbase-sqlalchemy
386387
The expected connection string is formatted as follows:
387388

388389
```
389-
couchbasedb://{username}:{password}@{hostname}:{port}?truststorepath={certificate path}?ssl={true/false}
390+
couchbase://{username}:{password}@{hostname}:{port}?truststorepath={certificate path}?ssl={true/false}
390391
```
391392

392393

superset/db_engine_specs/couchbasedb.py renamed to superset/db_engine_specs/couchbase.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@ class CouchbaseParametersSchema(Schema):
7474
)
7575

7676

77-
class CouchbaseDbEngineSpec(BasicParametersMixin, BaseEngineSpec):
78-
engine = "couchbasedb"
77+
class CouchbaseEngineSpec(BasicParametersMixin, BaseEngineSpec):
78+
engine = "couchbase"
79+
engine_aliases = {"couchbasedb"}
7980
engine_name = "Couchbase"
80-
default_driver = "couchbasedb"
81+
default_driver = "couchbase"
8182
allows_joins = False
8283
allows_subqueries = False
8384
sqlalchemy_uri_placeholder = (
84-
"couchbasedb://user:password@host[:port]?truststorepath=value?ssl=value"
85+
"couchbase://user:password@host[:port]?truststorepath=value?ssl=value"
8586
)
8687
parameters_schema = CouchbaseParametersSchema()
8788

@@ -128,7 +129,7 @@ def build_sqlalchemy_uri(
128129

129130
if parameters.get("port") is None:
130131
uri = URL.create(
131-
"couchbasedb",
132+
"couchbase",
132133
username=parameters.get("username"),
133134
password=parameters.get("password"),
134135
host=parameters["host"],
@@ -137,7 +138,7 @@ def build_sqlalchemy_uri(
137138
)
138139
else:
139140
uri = URL.create(
140-
"couchbasedb",
141+
"couchbase",
141142
username=parameters.get("username"),
142143
password=parameters.get("password"),
143144
host=parameters["host"],

superset/sql_parse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"clickhouse": Dialects.CLICKHOUSE,
103103
"clickhousedb": Dialects.CLICKHOUSE,
104104
"cockroachdb": Dialects.POSTGRES,
105-
"couchbasedb": Dialects.MYSQL,
105+
"couchbase": Dialects.MYSQL,
106106
# "crate": ???
107107
# "databend": ???
108108
"databricks": Dialects.DATABRICKS,

tests/unit_tests/db_engine_specs/test_couchbase.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ def test_epoch_to_dttm() -> None:
3333
"""
3434
DB Eng Specs (couchbase): Test epoch to dttm
3535
"""
36-
from superset.db_engine_specs.couchbasedb import CouchbaseDbEngineSpec
36+
from superset.db_engine_specs.couchbase import CouchbaseEngineSpec
3737

38-
assert CouchbaseDbEngineSpec.epoch_to_dttm() == "MILLIS_TO_STR({col} * 1000)"
38+
assert CouchbaseEngineSpec.epoch_to_dttm() == "MILLIS_TO_STR({col} * 1000)"
3939

4040

4141
def test_epoch_ms_to_dttm() -> None:
4242
"""
4343
DB Eng Specs (couchbase): Test epoch ms to dttm
4444
"""
45-
from superset.db_engine_specs.couchbasedb import CouchbaseDbEngineSpec
45+
from superset.db_engine_specs.couchbase import CouchbaseEngineSpec
4646

47-
assert CouchbaseDbEngineSpec.epoch_ms_to_dttm() == "MILLIS_TO_STR({col})"
47+
assert CouchbaseEngineSpec.epoch_ms_to_dttm() == "MILLIS_TO_STR({col})"
4848

4949

5050
@pytest.mark.parametrize(
@@ -62,7 +62,7 @@ def test_convert_dttm(
6262
expected_result: Optional[str],
6363
dttm: datetime, # noqa: F811
6464
) -> None:
65-
from superset.db_engine_specs.couchbasedb import CouchbaseDbEngineSpec as spec
65+
from superset.db_engine_specs.couchbase import CouchbaseEngineSpec as spec
6666

6767
assert_convert_dttm(spec, target_type, expected_result, dttm)
6868

@@ -88,6 +88,6 @@ def test_get_column_spec(
8888
generic_type: GenericDataType,
8989
is_dttm: bool,
9090
) -> None:
91-
from superset.db_engine_specs.couchbasedb import CouchbaseDbEngineSpec as spec
91+
from superset.db_engine_specs.couchbase import CouchbaseEngineSpec as spec
9292

9393
assert_column_spec(spec, native_type, sqla_type, attrs, generic_type, is_dttm)

0 commit comments

Comments
 (0)