diff --git a/nexus.nimble b/nexus.nimble index ddf3a62..dcf12e1 100644 --- a/nexus.nimble +++ b/nexus.nimble @@ -1,6 +1,6 @@ # Package -version = "0.1.1" +version = "2.0.0" author = "jfilby" description = "Nexus Development Framework" license = "Apache-2.0" @@ -11,6 +11,7 @@ srcDir = "src" requires "nim >= 1.6.0" requires "argon2" +requires "db_connector" requires "chronicles" requires "jester" requires "karax" diff --git a/src/nexus/cmd/service/generate/models/read_model_files.nim b/src/nexus/cmd/service/generate/models/read_model_files.nim index f5da059..0cf794d 100644 --- a/src/nexus/cmd/service/generate/models/read_model_files.nim +++ b/src/nexus/cmd/service/generate/models/read_model_files.nim @@ -31,7 +31,7 @@ proc createBasicModelTypesFile*( var typeStr = "# Minimal model_types file (no models defined)with a DbContext definition\n" & - "import db_postgres\n" & + "import db_connector/db_postgres\n" & "\n" & "type\n" & &" {module.nameInPascalCase}DbContext* = object\n" & @@ -233,7 +233,7 @@ proc readModelFile(modelFiles: var seq[string], modelModuleTypeTable: Table[string, string] # [ model.module, moduleType definition ] fileModuleName = "" moduleMinimumImports = - @[ "db_postgres", + @[ "db_connector/db_postgres", "tables" ] # Validate diff --git a/src/nexus/cmd/service/generate/models/uncached/gen_data_access.nim b/src/nexus/cmd/service/generate/models/uncached/gen_data_access.nim index 558b352..6479875 100644 --- a/src/nexus/cmd/service/generate/models/uncached/gen_data_access.nim +++ b/src/nexus/cmd/service/generate/models/uncached/gen_data_access.nim @@ -259,7 +259,7 @@ proc generateDataAccessFile*( var thirdPartySeqs: seq[string] thirdPartyImports = - toOrderedSet( @[ "db_postgres", + toOrderedSet( @[ "db_connector/db_postgres", "options", "sequtils", "strutils" ]) diff --git a/src/nexus/cmd/service/generate/modules/gen_db_context_procs.nim b/src/nexus/cmd/service/generate/modules/gen_db_context_procs.nim index 8590647..f7a1402 100644 --- a/src/nexus/cmd/service/generate/modules/gen_db_context_procs.nim +++ b/src/nexus/cmd/service/generate/modules/gen_db_context_procs.nim @@ -48,7 +48,8 @@ proc generateDbContextProcs*( moduleName = module.name # Imports - var str = "import db_postgres, tables\n" & + var str = "import tables\n" & + "import db_connector/db_postgres\n" & &"import {module.importPath}/types/model_types\n" & "\n" & "\n" diff --git a/src/nexus/cmd/service/migrations/bootstrap/bootstrap_models.nim b/src/nexus/cmd/service/migrations/bootstrap/bootstrap_models.nim index 3e21078..c233eb9 100644 --- a/src/nexus/cmd/service/migrations/bootstrap/bootstrap_models.nim +++ b/src/nexus/cmd/service/migrations/bootstrap/bootstrap_models.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, os, strformat, strutils +import chronicles, os, strformat, strutils +import db_connector/db_postgres proc bootstrapMigrationTables*( diff --git a/src/nexus/cmd/types/model_db_types.nim b/src/nexus/cmd/types/model_db_types.nim index fce1def..6b20518 100644 --- a/src/nexus/cmd/types/model_db_types.nim +++ b/src/nexus/cmd/types/model_db_types.nim @@ -17,21 +17,21 @@ type const stdlibDbMySql = DbDriver( - driver: "stdlib/db_mysql", + driver: "db_connector/db_mysql", minDbVersion: none(String), package: none(String), `import`: "db_mysql") stdlibDbPostgres = DbDriver( - driver: "stdlib/db_postgres", + driver: "db_connector/db_postgres", minDbVersion: none(String), package: none(String), `import`: "db_postgres") stdlibDbSqlite = DbDriver( - driver: "stdlib/db_sqlite", + driver: "db_connector/db_sqlite", minDbVersion: none(String), package: none(String), `import`: "db_sqlite") diff --git a/src/nexus/core/cached_data_access/account_user_role_cached_data.nim b/src/nexus/core/cached_data_access/account_user_role_cached_data.nim index e255bf2..3a3ca34 100644 --- a/src/nexus/core/cached_data_access/account_user_role_cached_data.nim +++ b/src/nexus/core/cached_data_access/account_user_role_cached_data.nim @@ -1,5 +1,6 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import options, sequtils, strutils, times +import db_connector/db_postgres import nexus/core/data_access/data_utils import nexus/core/data_access/pg_try_insert_id import nexus/core/types/model_types diff --git a/src/nexus/core/cached_data_access/invite_cached_data.nim b/src/nexus/core/cached_data_access/invite_cached_data.nim index 4209024..fa7dace 100644 --- a/src/nexus/core/cached_data_access/invite_cached_data.nim +++ b/src/nexus/core/cached_data_access/invite_cached_data.nim @@ -1,5 +1,6 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import options, sequtils, strutils, times +import db_connector/db_postgres import nexus/core/data_access/data_utils import nexus/core/data_access/pg_try_insert_id import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/account_data.nim b/src/nexus/core/data_access/account_data.nim index 1156ba1..32ffc09 100644 --- a/src/nexus/core/data_access/account_data.nim +++ b/src/nexus/core/data_access/account_data.nim @@ -1,4 +1,5 @@ -import db_postgres, options +import options +import db_connector/db_postgres type diff --git a/src/nexus/core/data_access/account_user_data.nim b/src/nexus/core/data_access/account_user_data.nim index f4f02a3..cfa9cb1 100644 --- a/src/nexus/core/data_access/account_user_data.nim +++ b/src/nexus/core/data_access/account_user_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/account_user_role_data.nim b/src/nexus/core/data_access/account_user_role_data.nim index 979b59e..840ef5c 100644 --- a/src/nexus/core/data_access/account_user_role_data.nim +++ b/src/nexus/core/data_access/account_user_role_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/account_user_token_data.nim b/src/nexus/core/data_access/account_user_token_data.nim index ba16c8b..015df84 100644 --- a/src/nexus/core/data_access/account_user_token_data.nim +++ b/src/nexus/core/data_access/account_user_token_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import db_connector/db_postgres, options, sequtils, strutils, times import nexus/core/data_access/data_utils import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/data_utils.nim b/src/nexus/core/data_access/data_utils.nim index c8cd1e2..1dac615 100644 --- a/src/nexus/core/data_access/data_utils.nim +++ b/src/nexus/core/data_access/data_utils.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, strutils, times +import chronicles, strutils, times +import db_connector/db_postgres # Forward declarations diff --git a/src/nexus/core/data_access/db_conn.nim b/src/nexus/core/data_access/db_conn.nim index 92a7158..a4f7bbe 100644 --- a/src/nexus/core/data_access/db_conn.nim +++ b/src/nexus/core/data_access/db_conn.nim @@ -1,4 +1,5 @@ -import db_postgres, locks, options, os, strformat, strutils +import locks, options, os, strformat, strutils +import db_connector/db_postgres # DB open connection lock diff --git a/src/nexus/core/data_access/invite_data.nim b/src/nexus/core/data_access/invite_data.nim index eeec4ec..c482fe6 100644 --- a/src/nexus/core/data_access/invite_data.nim +++ b/src/nexus/core/data_access/invite_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/nexus_setting_data.nim b/src/nexus/core/data_access/nexus_setting_data.nim index 277f6fd..dd03185 100644 --- a/src/nexus/core/data_access/nexus_setting_data.nim +++ b/src/nexus/core/data_access/nexus_setting_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core/types/model_types diff --git a/src/nexus/core/data_access/pg_try_insert_id.nim b/src/nexus/core/data_access/pg_try_insert_id.nim index 06df370..f959723 100644 --- a/src/nexus/core/data_access/pg_try_insert_id.nim +++ b/src/nexus/core/data_access/pg_try_insert_id.nim @@ -1,7 +1,8 @@ # This is a custom verion of Nim's v1.2 db_postgres.tryInsertID that allows the ID field name to be specified # The original version is found in: https://github.com/nim-lang/Nim/blob/devel/lib/impure/db_postgres.nim -import db_common, db_postgres, postgres, strutils +import db_common, postgres, strutils +import db_connector/db_postgres proc dbFormat(formatstr: SqlQuery, args: varargs[string]): string = diff --git a/src/nexus/core/service/account/login_action.nim b/src/nexus/core/service/account/login_action.nim index 5b415b2..ce08720 100644 --- a/src/nexus/core/service/account/login_action.nim +++ b/src/nexus/core/service/account/login_action.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, json, options, strformat, tables, times +import chronicles, jester, json, options, strformat, tables, times +import db_connector/db_postgres import docui/service/sdk/docui_elements import docui/service/sdk/docui_types import docui/service/sdk/docui_utils diff --git a/src/nexus/core/service/account/roles.nim b/src/nexus/core/service/account/roles.nim index 2e7a8ab..63ead50 100644 --- a/src/nexus/core/service/account/roles.nim +++ b/src/nexus/core/service/account/roles.nim @@ -1,4 +1,4 @@ -import db_postgres +import db_connector/db_postgres import nexus/core/data_access/account_user_role_data import nexus/core/types/model_types diff --git a/src/nexus/core/service/account/session.nim b/src/nexus/core/service/account/session.nim index e3ab6f7..4bfe162 100644 --- a/src/nexus/core/service/account/session.nim +++ b/src/nexus/core/service/account/session.nim @@ -1,5 +1,6 @@ # Sessions are deprecated, replaced by JWT. -import chronicles, db_postgres, jester, marshal, options, random_key, streams +import chronicles, jester, marshal, options, random_key, streams +import db_connector/db_postgres import nexus/core/data_access/session_data diff --git a/src/nexus/core/service/account/verify_account_fields.nim b/src/nexus/core/service/account/verify_account_fields.nim index 3f8f9a1..c3f77a6 100644 --- a/src/nexus/core/service/account/verify_account_fields.nim +++ b/src/nexus/core/service/account/verify_account_fields.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, json, strformat, strutils, tables +import chronicles, json, strformat, strutils, tables +import db_connector/db_postgres import docui/service/sdk/docui_elements import docui/service/sdk/docui_types import docui/service/sdk/docui_utils diff --git a/src/nexus/core/service/account/verify_login_fields.nim b/src/nexus/core/service/account/verify_login_fields.nim index 88d549f..6f11921 100644 --- a/src/nexus/core/service/account/verify_login_fields.nim +++ b/src/nexus/core/service/account/verify_login_fields.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, json, options, tables +import chronicles, jester, json, options, tables +import db_connector/db_postgres import docui/service/sdk/docui_elements import docui/service/sdk/docui_types import docui/service/sdk/docui_utils diff --git a/src/nexus/core/service/account/verify_my_account_fields.nim b/src/nexus/core/service/account/verify_my_account_fields.nim index 0f90769..26e7db9 100644 --- a/src/nexus/core/service/account/verify_my_account_fields.nim +++ b/src/nexus/core/service/account/verify_my_account_fields.nim @@ -1,4 +1,4 @@ -import db_postgres +import db_connector/db_postgres import docui/service/sdk/docui_types import docui/service/sdk/docui_utils import nexus/core/types/model_types diff --git a/src/nexus/core/service/account/verify_sign_up_code_fields.nim b/src/nexus/core/service/account/verify_sign_up_code_fields.nim index b382bd1..0589165 100644 --- a/src/nexus/core/service/account/verify_sign_up_code_fields.nim +++ b/src/nexus/core/service/account/verify_sign_up_code_fields.nim @@ -1,4 +1,5 @@ -import db_postgres, options, json, tables +import options, json, tables +import db_connector/db_postgres import docui/service/sdk/docui_elements import docui/service/sdk/docui_types import docui/service/sdk/docui_utils diff --git a/src/nexus/core/service/account/verify_sign_up_fields.nim b/src/nexus/core/service/account/verify_sign_up_fields.nim index 86b2514..8b6135c 100644 --- a/src/nexus/core/service/account/verify_sign_up_fields.nim +++ b/src/nexus/core/service/account/verify_sign_up_fields.nim @@ -1,4 +1,5 @@ -import db_postgres, json, tables +import json, tables +import db_connector/db_postgres import docui/service/sdk/docui_elements import docui/service/sdk/docui_types import docui/service/sdk/docui_utils diff --git a/src/nexus/core/service/invite/verify_invite_fields.nim b/src/nexus/core/service/invite/verify_invite_fields.nim index cbbdfeb..ba7bea2 100644 --- a/src/nexus/core/service/invite/verify_invite_fields.nim +++ b/src/nexus/core/service/invite/verify_invite_fields.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, strutils +import chronicles, strutils +import db_connector/db_postgres import nexus/core/data_access/account_user_data import nexus/core/data_access/invite_data import nexus/core/service/account/verify_account_fields diff --git a/src/nexus/core/service/module/db_context.nim b/src/nexus/core/service/module/db_context.nim index c6454d5..f08d41d 100644 --- a/src/nexus/core/service/module/db_context.nim +++ b/src/nexus/core/service/module/db_context.nim @@ -1,4 +1,5 @@ -import db_postgres, tables +import tables +import db_connector/db_postgres import nexus/core/types/model_types diff --git a/src/nexus/core/service/scheduled/daily.nim b/src/nexus/core/service/scheduled/daily.nim index 518b2cd..803a45f 100644 --- a/src/nexus/core/service/scheduled/daily.nim +++ b/src/nexus/core/service/scheduled/daily.nim @@ -1,4 +1,4 @@ -import db_postgres +import db_connector/db_postgres import nexus/core/service/account/jwt_utils diff --git a/src/nexus/core/types/model_types.nim b/src/nexus/core/types/model_types.nim index 7469a48..60b832d 100644 --- a/src/nexus/core/types/model_types.nim +++ b/src/nexus/core/types/model_types.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, tables, times +import db_connector/db_postgres, options, tables, times type diff --git a/src/nexus/core/types/view_types.nim b/src/nexus/core/types/view_types.nim index a80850f..76276c0 100644 --- a/src/nexus/core/types/view_types.nim +++ b/src/nexus/core/types/view_types.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, json, options, os, strutils +import chronicles, jester, json, options, os, strutils +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import docui/service/sdk/docui_types import nexus/core/data_access/db_conn diff --git a/src/nexus/core/view/account/login_page.nim b/src/nexus/core/view/account/login_page.nim index 23bf1e6..4b4a2da 100644 --- a/src/nexus/core/view/account/login_page.nim +++ b/src/nexus/core/view/account/login_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, json, options, strformat, strutils +import chronicles, jester, json, options, strformat, strutils +import db_connector/db_postgres import tables, times import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data diff --git a/src/nexus/core/view/account/logout_page.nim b/src/nexus/core/view/account/logout_page.nim index 61097b1..a3a7104 100644 --- a/src/nexus/core/view/account/logout_page.nim +++ b/src/nexus/core/view/account/logout_page.nim @@ -1,4 +1,5 @@ -import db_postgres, htmlgen, jester, options +import htmlgen, jester, options +import db_connector/db_postgres import nexus/core/data_access/db_conn import nexus/core/service/account/jwt_utils import nexus/core/types/context_type diff --git a/src/nexus/core/view/account/my_account_page.nim b/src/nexus/core/view/account/my_account_page.nim index 24b565d..919b833 100644 --- a/src/nexus/core/view/account/my_account_page.nim +++ b/src/nexus/core/view/account/my_account_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, options, strformat +import chronicles, jester, options, strformat +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/db_conn diff --git a/src/nexus/core/view/account/reset_password_page.nim b/src/nexus/core/view/account/reset_password_page.nim index 82589c3..471ba39 100644 --- a/src/nexus/core/view/account/reset_password_page.nim +++ b/src/nexus/core/view/account/reset_password_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, options, strformat, uri +import chronicles, jester, options, strformat, uri +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/db_conn diff --git a/src/nexus/core/view/account/sign_up_page.nim b/src/nexus/core/view/account/sign_up_page.nim index e888f3e..486f0b3 100644 --- a/src/nexus/core/view/account/sign_up_page.nim +++ b/src/nexus/core/view/account/sign_up_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, options, strformat, times +import chronicles, jester, options, strformat, times +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/account_user_role_data diff --git a/src/nexus/core/view/account/sign_up_resend_sign_up_code_page.nim b/src/nexus/core/view/account/sign_up_resend_sign_up_code_page.nim index 1162467..410fb39 100644 --- a/src/nexus/core/view/account/sign_up_resend_sign_up_code_page.nim +++ b/src/nexus/core/view/account/sign_up_resend_sign_up_code_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, options +import chronicles, jester, options +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/db_conn diff --git a/src/nexus/core/view/account/sign_up_verify_page.nim b/src/nexus/core/view/account/sign_up_verify_page.nim index 8ca2e4f..a77c3c1 100644 --- a/src/nexus/core/view/account/sign_up_verify_page.nim +++ b/src/nexus/core/view/account/sign_up_verify_page.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, json, options, strformat +import chronicles, jester, json, options, strformat +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/db_conn diff --git a/src/nexus/core/view/invite/invite_page.nim b/src/nexus/core/view/invite/invite_page.nim index 864b47e..8d0bc48 100644 --- a/src/nexus/core/view/invite/invite_page.nim +++ b/src/nexus/core/view/invite/invite_page.nim @@ -1,4 +1,5 @@ -import db_postgres, jester, options, strformat, times +import jester, options, strformat, times +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/data_access/account_user_data import nexus/core/data_access/db_conn diff --git a/src/nexus/core_extras/data_access/cached_key_value_data.nim b/src/nexus/core_extras/data_access/cached_key_value_data.nim index 15c43e2..6a57d36 100644 --- a/src/nexus/core_extras/data_access/cached_key_value_data.nim +++ b/src/nexus/core_extras/data_access/cached_key_value_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/data_access/country_timezone_data.nim b/src/nexus/core_extras/data_access/country_timezone_data.nim index 6bf62bb..c4fb222 100644 --- a/src/nexus/core_extras/data_access/country_timezone_data.nim +++ b/src/nexus/core_extras/data_access/country_timezone_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import db_connector/db_postgres, options, sequtils, strutils, times import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/data_access/list_item_data.nim b/src/nexus/core_extras/data_access/list_item_data.nim index 26d71a5..0101988 100644 --- a/src/nexus/core_extras/data_access/list_item_data.nim +++ b/src/nexus/core_extras/data_access/list_item_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/data_access/menu_item_data.nim b/src/nexus/core_extras/data_access/menu_item_data.nim index 90388ed..92a6775 100644 --- a/src/nexus/core_extras/data_access/menu_item_data.nim +++ b/src/nexus/core_extras/data_access/menu_item_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/data_access/temp_form_data_data.nim b/src/nexus/core_extras/data_access/temp_form_data_data.nim index fdbc591..db54b5a 100644 --- a/src/nexus/core_extras/data_access/temp_form_data_data.nim +++ b/src/nexus/core_extras/data_access/temp_form_data_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import db_connector/db_postgres, options, sequtils, strutils, times import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/data_access/temp_queue_data_data.nim b/src/nexus/core_extras/data_access/temp_queue_data_data.nim index a68f880..6500105 100644 --- a/src/nexus/core_extras/data_access/temp_queue_data_data.nim +++ b/src/nexus/core_extras/data_access/temp_queue_data_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times +import db_connector/db_postgres, options, sequtils, strutils, times import nexus/core/data_access/data_utils import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/service/lists/load_lists.nim b/src/nexus/core_extras/service/lists/load_lists.nim index 0f02945..6836fc9 100644 --- a/src/nexus/core_extras/service/lists/load_lists.nim +++ b/src/nexus/core_extras/service/lists/load_lists.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, os, streams, strformat, times, yaml +import chronicles, os, streams, strformat, times, yaml +import db_connector/db_postgres import nexus/core_extras/data_access/list_item_data import nexus/core_extras/types/context_type import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/service/menus/load_menus.nim b/src/nexus/core_extras/service/menus/load_menus.nim index 0c83354..fde94f2 100644 --- a/src/nexus/core_extras/service/menus/load_menus.nim +++ b/src/nexus/core_extras/service/menus/load_menus.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, os, streams, strformat, times, yaml +import chronicles, os, streams, strformat, times, yaml +import db_connector/db_postgres import nexus/core/service/format/type_utils import nexus/core_extras/data_access/menu_item_data import nexus/core_extras/service/lists/list_utils diff --git a/src/nexus/core_extras/service/module/db_context.nim b/src/nexus/core_extras/service/module/db_context.nim index 50b998b..b0003ae 100644 --- a/src/nexus/core_extras/service/module/db_context.nim +++ b/src/nexus/core_extras/service/module/db_context.nim @@ -1,4 +1,5 @@ -import db_postgres, tables +import tables +import db_connector/db_postgres import nexus/core_extras/types/model_types diff --git a/src/nexus/core_extras/service/user/admin_user.nim b/src/nexus/core_extras/service/user/admin_user.nim index 78d4c4c..96db81c 100644 --- a/src/nexus/core_extras/service/user/admin_user.nim +++ b/src/nexus/core_extras/service/user/admin_user.nim @@ -1,4 +1,5 @@ -import db_postgres, options, times +import options, times +import db_connector/db_postgres import nexus/core/data_access/account_user_data import nexus/core/data_access/account_user_role_data import nexus/core/service/account/encrypt diff --git a/src/nexus/core_extras/types/model_types.nim b/src/nexus/core_extras/types/model_types.nim index ada789b..f42063e 100644 --- a/src/nexus/core_extras/types/model_types.nim +++ b/src/nexus/core_extras/types/model_types.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, tables, times +import db_connector/db_postgres, options, tables, times type diff --git a/src/nexus/crm/data_access/mailing_list_data.nim b/src/nexus/crm/data_access/mailing_list_data.nim index 37da8e5..1bcb829 100644 --- a/src/nexus/crm/data_access/mailing_list_data.nim +++ b/src/nexus/crm/data_access/mailing_list_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/crm/types/model_types diff --git a/src/nexus/crm/data_access/mailing_list_message_data.nim b/src/nexus/crm/data_access/mailing_list_message_data.nim index 2c167c2..9750e88 100644 --- a/src/nexus/crm/data_access/mailing_list_message_data.nim +++ b/src/nexus/crm/data_access/mailing_list_message_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/crm/types/model_types diff --git a/src/nexus/crm/data_access/mailing_list_subscriber_data.nim b/src/nexus/crm/data_access/mailing_list_subscriber_data.nim index c191bcb..1c652cb 100644 --- a/src/nexus/crm/data_access/mailing_list_subscriber_data.nim +++ b/src/nexus/crm/data_access/mailing_list_subscriber_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/crm/types/model_types diff --git a/src/nexus/crm/data_access/mailing_list_subscriber_message_data.nim b/src/nexus/crm/data_access/mailing_list_subscriber_message_data.nim index cfa52cd..54151f5 100644 --- a/src/nexus/crm/data_access/mailing_list_subscriber_message_data.nim +++ b/src/nexus/crm/data_access/mailing_list_subscriber_message_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/crm/types/model_types diff --git a/src/nexus/crm/service/module/db_context.nim b/src/nexus/crm/service/module/db_context.nim index 2fdb5ec..24c8e84 100644 --- a/src/nexus/crm/service/module/db_context.nim +++ b/src/nexus/crm/service/module/db_context.nim @@ -1,4 +1,5 @@ -import db_postgres, tables +import tables +import db_connector/db_postgres import nexus/crm/types/model_types diff --git a/src/nexus/crm/types/model_types.nim b/src/nexus/crm/types/model_types.nim index 93e2239..8678015 100644 --- a/src/nexus/crm/types/model_types.nim +++ b/src/nexus/crm/types/model_types.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, tables, times +import db_connector/db_postgres, options, tables, times type diff --git a/src/nexus/crm/view/user/mailing_list/stats.nim b/src/nexus/crm/view/user/mailing_list/stats.nim index 9b5259d..060c64b 100644 --- a/src/nexus/crm/view/user/mailing_list/stats.nim +++ b/src/nexus/crm/view/user/mailing_list/stats.nim @@ -1,4 +1,5 @@ -import chronicles, db_postgres, jester, options, strformat, strutils, times +import chronicles, jester, options, strformat, strutils, times +import db_connector/db_postgres import karax / [karaxdsl, vdom, vstyles] import nexus/core/types/view_types import nexus/core/view/common/spacers diff --git a/src/nexus/social/data_access/sm_post_data.nim b/src/nexus/social/data_access/sm_post_data.nim index 4c621c8..ed8de53 100644 --- a/src/nexus/social/data_access/sm_post_data.nim +++ b/src/nexus/social/data_access/sm_post_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils, times, uuids +import db_connector/db_postgres, options, sequtils, strutils, times, uuids import nexus/core/data_access/data_utils import nexus/social/types/model_types diff --git a/src/nexus/social/data_access/sm_post_vote_data.nim b/src/nexus/social/data_access/sm_post_vote_data.nim index 4532b8b..7957e14 100644 --- a/src/nexus/social/data_access/sm_post_vote_data.nim +++ b/src/nexus/social/data_access/sm_post_vote_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils +import db_connector/db_postgres, options, sequtils, strutils import nexus/social/types/model_types diff --git a/src/nexus/social/data_access/sm_post_vote_user_data.nim b/src/nexus/social/data_access/sm_post_vote_user_data.nim index 9a788c9..3df6327 100644 --- a/src/nexus/social/data_access/sm_post_vote_user_data.nim +++ b/src/nexus/social/data_access/sm_post_vote_user_data.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, sequtils, strutils +import db_connector/db_postgres, options, sequtils, strutils import nexus/core/data_access/data_utils import nexus/social/types/model_types diff --git a/src/nexus/social/service/module/db_context.nim b/src/nexus/social/service/module/db_context.nim index a884544..ff903a7 100644 --- a/src/nexus/social/service/module/db_context.nim +++ b/src/nexus/social/service/module/db_context.nim @@ -1,4 +1,5 @@ -import db_postgres, tables +import tables +import db_connector/db_postgres import nexus/social/types/model_types diff --git a/src/nexus/social/types/model_types.nim b/src/nexus/social/types/model_types.nim index b60f851..49e8716 100644 --- a/src/nexus/social/types/model_types.nim +++ b/src/nexus/social/types/model_types.nim @@ -1,5 +1,5 @@ # Nexus generated file -import db_postgres, options, tables, times +import db_connector/db_postgres, options, tables, times type