Fix admin api create_ddl codepath · 7dracoder/python-spanner-orm@9f7fbd4 · GitHub

7dracoder / python-spanner-orm Public

forked from google/python-spanner-orm

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 9f7fbd4

Browse filesBrowse the repository at this point in the historyBrowse files

dcbrandao

committed

Fix admin api create_ddl codepath

The unit test didn't cover this codepath. Added a unit test, fixed the codepath, and added a shortcut to the SpannerAdminApi

1 parent 10fd35d commit 9f7fbd4
Copy full SHA for 9f7fbd4

3 files changed

+9-1Lines changed: 9 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• spanner_orm
  • __init__.py
  • admin
    • api.py
  • tests
    • api_test.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎spanner_orm/__init__.py‎

Copy file name to clipboardExpand all lines: spanner_orm/__init__.py

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -20,13 +20,15 @@
20	20	from spanner_orm import field
21	21	from spanner_orm import model
22	22	from spanner_orm import relationship
	23	+ from spanner_orm.admin import api as admin_api
23	24
24	25	# add NullHandler to root-module logger so that individual modules
25	26	# won't have to.
26	27	logging.getLogger(__name__).addHandler(logging.NullHandler())
27	28
28	29	# pylint: disable=invalid-name
29	30	SpannerApi = api.SpannerApi
	31	+ SpannerAdminApi = admin_api.SpannerAdminApi
30	32
31	33	Model = model.Model
32	34

Collapse file

‎spanner_orm/admin/api.py‎

Copy file name to clipboardExpand all lines: spanner_orm/admin/api.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -46,7 +46,7 @@ def connect(cls,
46	46	if create_ddl is not None:
47	47	cls._spanner_connection = instance.database(
48	48	database, ddl_statements=create_ddl)
49		- operation = cls._connection.create()
	49	+ operation = cls._spanner_connection.create()
50	50	operation.result()
51	51	else:
52	52	cls._spanner_connection = instance.database(database)

Collapse file

‎spanner_orm/tests/api_test.py‎

Copy file name to clipboardExpand all lines: spanner_orm/tests/api_test.py

+6Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -51,6 +51,12 @@ def test_admin_api_connection(self, client):
51	51	with self.assertRaises(error.SpannerError):
52	52	api.SpannerApi._connection()
53	53
	54	+ @mock.patch('google.cloud.spanner.Client')
	55	+ def test_admin_api_create_ddl_connection(self, client):
	56	+ connection = self.mock_connection(client)
	57	+ admin_api.SpannerAdminApi.connect('', '', '', create_ddl=['create ddl'])
	58	+ self.assertEqual(admin_api.SpannerAdminApi._connection(), connection)
	59	+
54	60	def mock_connection(self, client):
55	61	connection = mock.Mock()
56	62	client().instance().database.return_value = connection

0 commit comments

Comments

0 (0)