Update postgre

Author: BenConstable9

deploy_ai_search_indexes/pyproject.toml

@@ -37,8 +37,8 @@ snowflake = [
 databricks = [
     "text_2_sql_core[databricks]",
 ]
-postgresql = [
-    "text_2_sql_core[postgresql]",
+postgres = [
+    "text_2_sql_core[postgres]",
 ]
 sqlite = [
     "text_2_sql_core[sqlite]",

text_2_sql/.env.example

@@ -27,12 +27,12 @@ Text2Sql__Tsql__ConnectionString=<Tsql databaseConnectionString if using Tsql Da
 Text2Sql__Tsql__Database=<Tsql database if using Tsql Data Source>
 
 # PostgreSQL Specific Connection Details
-Text2Sql__Postgresql__ConnectionString=<Postgresql databaseConnectionString if using Postgresql Data Source and a connection string>
-Text2Sql__Postgresql__Database=<Postgresql database if using Postgresql Data Source>
-Text2Sql__Postgresql__User=<Postgresql user if using Postgresql Data Source and not the connections string>
-Text2Sql__Postgresql__Password=<Postgresql password if using Postgresql Data Source and not the connections string>
-Text2Sql__Postgresql__ServerHostname=<Postgresql serverHostname if using Postgresql Data Source and not the connections string>
-Text2Sql__Postgresql__Port=<Postgresql port if using Postgresql Data Source and not the connections string>
+Text2Sql__Postgres__ConnectionString=<Postgres databaseConnectionString if using Postgres Data Source and a connection string>
+Text2Sql__Postgres__Database=<Postgres database if using Postgres Data Source>
+Text2Sql__Postgres__User=<Postgres user if using Postgres Data Source and not the connections string>
+Text2Sql__Postgres__Password=<Postgres password if using Postgres Data Source and not the connections string>
+Text2Sql__Postgres__ServerHostname=<Postgres serverHostname if using Postgres Data Source and not the connections string>
+Text2Sql__Postgres__Port=<Postgres port if using Postgres Data Source and not the connections string>
 
 # Snowflake Specific Connection Details
 Text2Sql__Snowflake__User=<snowflakeUser if using Snowflake Data Source>

text_2_sql/autogen/pyproject.toml

@@ -42,8 +42,8 @@ snowflake = [
 databricks = [
     "text_2_sql_core[databricks]",
 ]
-postgresql = [
-    "text_2_sql_core[postgresql]",
+postgres = [
+    "text_2_sql_core[postgres]",
 ]
 sqlite = [
     "text_2_sql_core[sqlite]",

text_2_sql/data_dictionary/README.md

@@ -218,7 +218,7 @@ The following Databases have pre-built scripts for them:
 - **Databricks:** `./text_2_sql_core/data_dictionary/databricks_data_dictionary_creator.py`
 - **Snowflake:** `./text_2_sql_core/data_dictionary/snowflake_data_dictionary_creator.py`
 - **TSQL:** `./text_2_sql_core/data_dictionary/tsql_data_dictionary_creator.py`
-- **PostgreSQL:** `./text_2_sql_core/data_dictionary/postgresql_data_dictionary_creator.py`
+- **PostgreSQL:** `./text_2_sql_core/data_dictionary/postgres_data_dictionary_creator.py`
 
 If there is no pre-built script for your database engine, take one of the above as a starting point and adjust it.
 

text_2_sql/text_2_sql_core/pyproject.toml

@@ -47,7 +47,7 @@ databricks = [
     "databricks-sql-connector>=3.0.1",
     "pyarrow>=14.0.2,<17",
 ]
-postgresql = [
+postgres = [
     "psycopg>=3.2.3",
 ]
 sqlite = [

text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/factory.py

@@ -25,12 +25,12 @@ def get_database_connector():
                 from text_2_sql_core.connectors.tsql_sql import TsqlSqlConnector
 
                 return TsqlSqlConnector()
-            elif os.environ["Text2Sql__DatabaseEngine"].upper() == "POSTGRESQL":
-                from text_2_sql_core.connectors.postgresql_sql import (
-                    PostgresqlSqlConnector,
+            elif os.environ["Text2Sql__DatabaseEngine"].upper() == "POSTGRES":
+                from text_2_sql_core.connectors.postgres_sql import (
+                    PostgresSqlConnector,
                 )
 
-                return PostgresqlSqlConnector()
+                return PostgresSqlConnector()
             elif os.environ["Text2Sql__DatabaseEngine"].upper() == "SQLITE":
                 from text_2_sql_core.connectors.sqlite_sql import SQLiteSqlConnector
 

text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/postgresql_sql.py renamed to text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/postgres_sql.py

@@ -10,11 +10,11 @@
 from text_2_sql_core.utils.database import DatabaseEngine, DatabaseEngineSpecificFields
 
 
-class PostgresqlSqlConnector(SqlConnector):
+class PostgresSqlConnector(SqlConnector):
     def __init__(self):
         super().__init__()
 
-        self.database_engine = DatabaseEngine.POSTGRESQL
+        self.database_engine = DatabaseEngine.POSTGRES
 
     @property
     def engine_specific_rules(self) -> str:
@@ -67,10 +67,10 @@ async def query_execution(
         logging.info(f"Running query: {sql_query}")
         results = []
 
-        if "Text2Sql__Postgresql__ConnectionString" in os.environ:
-            logging.info("Postgresql Connection string found in environment variables.")
+        if "Text2Sql__Postgres__ConnectionString" in os.environ:
+            logging.info("Postgres Connection string found in environment variables.")
 
-            p = urlparse(os.environ["Text2Sql__Postgresql__ConnectionString"])
+            p = urlparse(os.environ["Text2Sql__Postgres__ConnectionString"])
 
             postgres_connections = {
                 "dbname": p.path[1:],
@@ -81,14 +81,14 @@ async def query_execution(
             }
         else:
             logging.warning(
-                "Postgresql Connection string not found in environment variables. Using individual variables."
+                "Postgres Connection string not found in environment variables. Using individual variables."
             )
             postgres_connections = {
-                "dbname": os.environ["Text2Sql__Postgresql__Database"],
-                "user": os.environ["Text2Sql__Postgresql__User"],
-                "password": os.environ["Text2Sql__Postgresql__Password"],
-                "port": os.environ["Text2Sql__Postgresql__Port"],
-                "host": os.environ["Text2Sql__Postgresql__ServerHostname"],
+                "dbname": os.environ["Text2Sql__Postgres__Database"],
+                "user": os.environ["Text2Sql__Postgres__User"],
+                "password": os.environ["Text2Sql__Postgres__Password"],
+                "port": os.environ["Text2Sql__Postgres__Port"],
+                "host": os.environ["Text2Sql__Postgres__ServerHostname"],
             }
 
         # Establish an asynchronous connection to the PostgreSQL database

text_2_sql/text_2_sql_core/src/text_2_sql_core/data_dictionary/cli.py

@@ -91,12 +91,12 @@ def create(
             data_dictionary_creator = TsqlDataDictionaryCreator(
                 **kwargs,
             )
-        elif engine == DatabaseEngine.POSTGRESQL:
-            from text_2_sql_core.data_dictionary.postgresql_data_dictionary_creator import (
-                PostgresqlDataDictionaryCreator,
+        elif engine == DatabaseEngine.POSTGRES:
+            from text_2_sql_core.data_dictionary.postgres_data_dictionary_creator import (
+                PostgresDataDictionaryCreator,
             )
 
-            data_dictionary_creator = PostgresqlDataDictionaryCreator(
+            data_dictionary_creator = PostgresDataDictionaryCreator(
                 **kwargs,
             )
         else:

text_2_sql/text_2_sql_core/src/text_2_sql_core/data_dictionary/postgresql_data_dictionary_creator.py renamed to text_2_sql/text_2_sql_core/src/text_2_sql_core/data_dictionary/postgres_data_dictionary_creator.py

@@ -8,19 +8,19 @@
 import os
 
 from text_2_sql_core.utils.database import DatabaseEngine
-from text_2_sql_core.connectors.postgresql_sql import PostgresqlSqlConnector
+from text_2_sql_core.connectors.postgres_sql import PostgresSqlConnector
 
 
-class PostgresqlDataDictionaryCreator(DataDictionaryCreator):
+class PostgresDataDictionaryCreator(DataDictionaryCreator):
     def __init__(self, **kwargs):
         """A method to initialize the DataDictionaryCreator class."""
         excluded_schemas = ["information_schema", "pg_catalog"]
         super().__init__(excluded_schemas=excluded_schemas, **kwargs)
 
-        self.database = os.environ["Text2Sql__Postgresql__Database"]
-        self.database_engine = DatabaseEngine.POSTGRESQL
+        self.database = os.environ["Text2Sql__Postgres__Database"]
+        self.database_engine = DatabaseEngine.POSTGRES
 
-        self.sql_connector = PostgresqlSqlConnector()
+        self.sql_connector = PostgresSqlConnector()
 
     @property
     def extract_table_entities_sql_query(self) -> str:
@@ -116,5 +116,5 @@ def extract_entity_relationships_sql_query(self) -> str:
 
 
 if __name__ == "__main__":
-    data_dictionary_creator = PostgresqlDataDictionaryCreator()
+    data_dictionary_creator = PostgresDataDictionaryCreator()
     asyncio.run(data_dictionary_creator.create_data_dictionary())

text_2_sql/text_2_sql_core/src/text_2_sql_core/utils/database.py

@@ -7,7 +7,7 @@ class DatabaseEngine(StrEnum):
     DATABRICKS = "DATABRICKS"
     SNOWFLAKE = "SNOWFLAKE"
     TSQL = "TSQL"
-    POSTGRESQL = "POSTGRESQL"
+    POSTGRES = "POSTGRES"
     SQLITE = "SQLITE"