Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cassandra client #2016

Merged
merged 8 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/studio-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ jobs:
run: "yarn run electron:build --publish never"

- name: Cleanup artifacts
if: matrix.os != 'windows-latest'
if: "!startsWith(matrix.os, 'windows')"
run: |
npx rimraf "apps/studio/dist_electron/!(*.exe|*.deb|*.rpm|*.AppImage|*.dmg|*.snap)"

- name: Cleanup artifacts Win
if: matrix.os == 'windows-latest'
if: "startsWith(matrix.os, 'windows')"
continue-on-error: true
run: |
npx rimraf "apps\studio\dist_electron\!(*.exe)"
Expand Down
7 changes: 4 additions & 3 deletions apps/studio/src/common/appdb/models/saved_connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export const ConnectionTypes = [
{ name: 'SQL Server', value: 'sqlserver' },
{ name: 'Amazon Redshift', value: 'redshift' },
{ name: 'CockroachDB', value: 'cockroachdb' },
{ name: 'Oracle Database', value: 'oracle'},
{ name: 'Apache Cassandra', value: 'cassandra'},
{ name: 'Oracle', value: 'other' },
{ name: 'Cassandra', value: 'other' },
{ name: 'BigQuery', value: 'bigquery' },
{ name: 'Firebird', value: 'firebird'},
]
Expand All @@ -44,6 +44,7 @@ export interface RedshiftOptions {
export interface CassandraOptions {
localDataCenter?: string
}

export interface BigQueryOptions {
keyFilename?: string;
projectId?: string;
Expand Down Expand Up @@ -77,7 +78,7 @@ export class DbConnectionBase extends ApplicationEntity {
@Column({ type: 'varchar', name: 'connectionType' })
public set connectionType(value: Nullable<ConnectionType>) {
if (this._connectionType !== value) {
const changePort = this._port === this.defaultPort || !this._port
const changePort = this._port === this.defaultPort
this._connectionType = parseConnectionType(value)
this._port = changePort ? this.defaultPort : this._port
}
Expand Down