Upgraded code for Nim v2.

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"

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

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" ])

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"

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*(

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")

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

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

src/nexus/core/data_access/account_data.nim

@@ -1,4 +1,5 @@
-import db_postgres, options
+import options
+import db_connector/db_postgres
 
 
 type

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
 

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
 

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
 

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

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

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
 

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
 

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 =

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

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
 

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
 
 

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

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

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

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

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

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

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
 
 

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
 
 

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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
 
 

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

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

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