Reformat with Black and prettier

pbugnion · Dec 31, 2019 · 738b4b6 · 738b4b6
1 parent b9ca7cd
commit 738b4b6
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 33 deletions.
diff --git a/__tests__/src/api/databaseStructure.test.ts b/__tests__/src/api/databaseStructure.test.ts
@@ -27,27 +27,27 @@ namespace Fixtures {
       tables: ['t1', 't2'],
       views: ['v1', 'v2']
     }
-  }
+  };
 
   export const databaseWithoutViews: DatabaseObjects = {
     tables: ['t1', 't2'],
     views: []
-  }
+  };
 
   export const successWithoutViewsResponseBody: DatabaseStructureResponse.Type = {
     responseType: 'success',
     responseData: {
       tables: ['t1', 't2']
     }
-  }
+  };
 
   export const successWithViewsEmptyResponseBody: DatabaseStructureResponse.Type = {
     responseType: 'success',
     responseData: {
       tables: ['t1', 't2'],
       views: []
     }
-  }
+  };
 
   export const errorResponseBody = {
     responseType: 'error',
@@ -57,9 +57,9 @@ namespace Fixtures {
   };
 
   export const mockServerWithResponse = (responseBody: Object) => {
-    const response: Response = new Response(JSON.stringify(responseBody))
-    return jest.fn(() => Promise.resolve(response))
-  }
+    const response: Response = new Response(JSON.stringify(responseBody));
+    return jest.fn(() => Promise.resolve(response));
+  };
 }
 
 describe('getDatabaseStructure', () => {
@@ -69,7 +69,9 @@ describe('getDatabaseStructure', () => {
   ];
 
   it.each(testCases)('valid %#: %s', async (_, responseBody) => {
-    ServerConnection.makeRequest = Fixtures.mockServerWithResponse(responseBody)
+    ServerConnection.makeRequest = Fixtures.mockServerWithResponse(
+      responseBody
+    );
 
     const result = await getDatabaseStructure('connectionUrl');
     expect(result).toEqual(responseBody);
@@ -88,29 +90,46 @@ describe('getDatabaseStructure', () => {
 
   const successTestCases: Array<Array<any>> = [
     ['with views', Fixtures.databaseWithViews, Fixtures.successResponseBody],
-    ['no views', Fixtures.databaseWithoutViews, Fixtures.successWithoutViewsResponseBody],
-    ['empty views', Fixtures.databaseWithoutViews, Fixtures.successWithViewsEmptyResponseBody]
-  ]
-  it.each(successTestCases)('matching on success %#: %s', async (_, expected, responseBody) => {
-    ServerConnection.makeRequest = Fixtures.mockServerWithResponse(responseBody);
+    [
+      'no views',
+      Fixtures.databaseWithoutViews,
+      Fixtures.successWithoutViewsResponseBody
+    ],
+    [
+      'empty views',
+      Fixtures.databaseWithoutViews,
+      Fixtures.successWithViewsEmptyResponseBody
+    ]
+  ];
+  it.each(successTestCases)(
+    'matching on success %#: %s',
+    async (_, expected, responseBody) => {
+      ServerConnection.makeRequest = Fixtures.mockServerWithResponse(
+        responseBody
+      );
 
-    const result = await getDatabaseStructure('connectionUrl');
+      const result = await getDatabaseStructure('connectionUrl');
 
-    const mockOnSuccess = jest.fn();
-    DatabaseStructureResponse.match(result, mockOnSuccess, jest.fn());
+      const mockOnSuccess = jest.fn();
+      DatabaseStructureResponse.match(result, mockOnSuccess, jest.fn());
 
-    expect(mockOnSuccess).toHaveBeenCalledWith(expected);
-  });
+      expect(mockOnSuccess).toHaveBeenCalledWith(expected);
+    }
+  );
 
   it('matching on error', async () => {
-    ServerConnection.makeRequest = Fixtures.mockServerWithResponse(Fixtures.errorResponseBody);
+    ServerConnection.makeRequest = Fixtures.mockServerWithResponse(
+      Fixtures.errorResponseBody
+    );
 
     const result = await getDatabaseStructure('connectionUrl');
 
     const mockOnError = jest.fn();
     DatabaseStructureResponse.match(result, jest.fn(), mockOnError);
 
-    expect(mockOnError).toHaveBeenCalledWith(Fixtures.errorResponseBody.responseData);
+    expect(mockOnError).toHaveBeenCalledWith(
+      Fixtures.errorResponseBody.responseData
+    );
   });
 
   it('bad http status code', async () => {

diff --git a/jupyterlab_sql/executor.py b/jupyterlab_sql/executor.py
@@ -43,7 +43,7 @@ def get_database_objects(self, connection_url):
         inspector = inspect(engine)
         database_objects = DatabaseObjects(
             tables=inspector.get_table_names(),
-            views=inspector.get_view_names()
+            views=inspector.get_view_names(),
         )
         return database_objects
 

diff --git a/jupyterlab_sql/models.py b/jupyterlab_sql/models.py
@@ -1,4 +1,3 @@
-
 from collections import namedtuple
 
 

diff --git a/jupyterlab_sql/responses.py b/jupyterlab_sql/responses.py
@@ -19,7 +19,7 @@ def success_no_rows():
 def success_with_database_objects(database_objects):
     response_data = {
         "tables": database_objects.tables,
-        "views": database_objects.views
+        "views": database_objects.views,
     }
     response = {"responseType": "success", "responseData": response_data}
     return response
diff --git a/jupyterlab_sql/tests/test_responses.py b/jupyterlab_sql/tests/test_responses.py
@@ -3,10 +3,10 @@
 
 
 def test_success_with_database_objects():
-    database_objects = DatabaseObjects(
-        tables=["t1", "t2"],
-        views=["v1", "v2"]
-    )
+    database_objects = DatabaseObjects(tables=["t1", "t2"], views=["v1", "v2"])
     response = success_with_database_objects(database_objects)
-    expected = {"responseType": "success", "responseData": {"tables": ["t1", "t2"], "views": ["v1", "v2"]}}
+    expected = {
+        "responseType": "success",
+        "responseData": {"tables": ["t1", "t2"], "views": ["v1", "v2"]},
+    }
     assert response == expected
diff --git a/src/api/databaseStructure.ts b/src/api/databaseStructure.ts
@@ -20,8 +20,8 @@ export async function getDatabaseStructure(
 
 export interface DatabaseObjects {
   tables: Array<string>;
-  views: Array<string>
-};
+  views: Array<string>;
+}
 
 export namespace DatabaseStructureResponse {
   export type Type = ErrorResponse | SuccessResponse;
@@ -38,7 +38,7 @@ export namespace DatabaseStructureResponse {
 
   type SuccessResponseData = {
     tables: Array<string>;
-    views?: Array<string>
+    views?: Array<string>;
   };
 
   type ErrorResponseData = {
@@ -75,8 +75,9 @@ export namespace DatabaseStructureResponse {
       // Remove in versions 4.x.
       const views = responseData.views || [];
       const databaseObjects: DatabaseObjects = {
-        tables, views
-      }
+        tables,
+        views
+      };
       return onSuccess(databaseObjects);
     }
   }