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.

Sign up for GitHub

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

google-sheets support new format #125

Merged
merged 1 commit into from
Dec 27, 2021
Merged

google-sheets support new format #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/external-db-google-sheets/lib/google_sheet_data_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { sheetFor, headersFrom, findRowById } = require('./google_sheet_utils')
const { eq } = require('velo-external-db-commons').AdapterOperators

class DataProvider {
constructor(doc, filterParser) {
Expand All @@ -19,11 +20,10 @@ class DataProvider {
}

async find(collectionName, filter, sort, skip, limit) {
const { filterExpr, fieldName, parameter } = this.filterParser.transform(filter)
const sheet = await sheetFor(collectionName, this.doc)

if (filterExpr === '$eq' && fieldName === '_id') {
const row = await findRowById(sheet, parameter)
console.log({ filter })
if (filter && filter.operator === eq && filter.fieldName === '_id') {
const row = await findRowById(sheet, filter.value)
return row !== undefined ? [this.formatRow(row)] : []
}

Expand Down
2 changes: 1 addition & 1 deletion packages/external-db-google-sheets/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { SchemaProvider, schemaSupportedOperations } = require('./google_sheet_schema_provider')
const DataProvider = require('./google_sheet_schema_provider')
const DataProvider = require('./google_sheet_data_provider')

const init = require('./connection_provider')
const { app: mockServer, cleanupSheets } = require('../tests/mock_google_sheets_api')
Expand Down
2 changes: 1 addition & 1 deletion packages/velo-external-db/lib/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const load = async() => {
const { dataProvider, schemaProvider, cleanup, databaseOperations, secretKey } = await init(adapterType, vendor, configReader)
const operationService = new OperationService(databaseOperations)
const schemaInformation = new CacheableSchemaInformation(schemaProvider)
const supportAdapterFormat = ['mysql', 'mongo', 'postgres', 'firestore', 'spanner', 'dynamodb', 'mssql', 'bigquery'].includes(adapterType)
const supportAdapterFormat = ['mysql', 'mongo', 'postgres', 'firestore', 'spanner', 'dynamodb', 'mssql', 'bigquery', 'google-sheet'].includes(adapterType)
const dataService = new DataService(dataProvider, schemaInformation, supportAdapterFormat)
const schemaService = new SchemaService(schemaProvider, schemaInformation)
initServices(dataService, schemaService, operationService, configReader, { vendor, type: adapterType })
Expand Down