Automatic addition of database before connecting to it #4316
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
feyruzb
force-pushed
the
improvement_of_new_product
branch
6 times, most recently
from
01343fb to
e39cd16
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
e39cd16 to
32aae73
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
12 times, most recently
from
0f4c534 to
8d84c11
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
5 times, most recently
from
e20770d to
451b2a2
Compare
…onality of add_product
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
f9dffb1 to
2bed7bb
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
1111841 to
e25167e
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
3 times, most recently
from
3beb9b8 to
59dcff3
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
59dcff3 to
b95b3aa
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
82205e7 to
078f1a3
Compare
bruntib
requested changes
Nov 22, 2024
| @@ -306,6 +309,58 @@ def getProductConfiguration(self, product_id): | |||
|
|
|||
| return prod | |||
|
|
|||
| @timeit | |||
| def add_product_support(self, product): | |||
There was a problem hiding this comment.
Functions that are not on the API could be "private", i.e. having double underscore prefix in their name: __add_product_support.
| to assist addProduct() function that connects to | ||
| an already existing database. | ||
| """ | ||
| self.__require_permission([permissions.SUPERUSER]) |
There was a problem hiding this comment.
Only API functions need to check permission. This function can't be called from outside.
There was a problem hiding this comment.
fixed, check removed
| @@ -912,6 +915,46 @@ def add_product(self, orm_product, init_db=False): | |||
|
|
|||
| self.__products[prod.endpoint] = prod | |||
|
|
|||
| def get_if_database_in_use(self, product): | |||
There was a problem hiding this comment.
Suggested change
| def get_if_database_in_use(self, product): | |
| def is_database_used(self, connection): |
| """ | ||
| # get the database name from the product connection string | ||
| is_sqlite = False | ||
| if product.database.endswith('.sqlite'): |
There was a problem hiding this comment.
Suggested change
| if product.database.endswith('.sqlite'): | |
| if product.engine == 'sqlite': |
|
|
||
| LOG.info("The database string that will be added: %s", to_add) | ||
|
|
||
| LOG.info("to add: %s", to_add) |
| ] | ||
|
|
||
| # True if found, False otherwise | ||
| LOG.info("dynamic list: %s", dynamic_list) |
| # remove the first 16 charecters because in query it is | ||
| # included in the path string | ||
| dynamic_list = [ | ||
| d[16:] if d.endswith('.sqlite') else d |
There was a problem hiding this comment.
We shouldn't rely on the length of a specific connection string prefix. d.split(':', 1) would split the connection string on the first : character.
|
|
||
| # remove the first 16 charecters because in query it is | ||
| # included in the path string | ||
| dynamic_list = [ |
There was a problem hiding this comment.
Could be merged with the previous list comprehension in line 936.
|
|
||
| # get the current state of connected databases from products | ||
| dynamic_list = [ | ||
| a.connection.replace('////', '/') |
There was a problem hiding this comment.
SQLAlchemy can be used for parsing the connection string: https://docs.sqlalchemy.org/en/20/core/engines.html#sqlalchemy.engine.make_url
This could be used for a better check condition in the loop at line 951.
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
054fa4b to
14414fe
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
3748e36 to
09f1ae7
Compare
feyruzb
force-pushed
the
improvement_of_new_product
branch
from
09f1ae7 to
83177b0
Compare
bruntib
approved these changes
Nov 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduced a new function
add_product_support()using SQLAlchemy to enhance theaddProduct()function.Automates the creation of the database for PostgreSQL and SQLite, eliminating the need for a manual script before connection.
Note: SQLite already supports automatic database creation.
Note2: The deletion of product doesn't delete the Postgres database, it was intentional , in case of accidental removal