From 096d12cb15e191dbd83f3399ba9bfef57bc9d826 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 11 Apr 2018 21:37:45 -0400
Subject: 0.26.0 sqlite single statement insertion of objects

- d2sqlite3 db.run, begin commit used with insert statement
- can be used after upstream fix
  that should follow d2sqlite3 0.16.0
---
 src/sdp/output/paths_source.d | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/sdp/output/paths_source.d')

diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d
index 59cb618..c420d7e 100644
--- a/src/sdp/output/paths_source.d
+++ b/src/sdp/output/paths_source.d
@@ -15,7 +15,7 @@ template PodManifest() {
   mixin SiSUrgxInit;
   static auto rgx = Rgx();
   auto PodManifest(P)(
-    P   _pth = "",
+    P   _pth
   ) {
     struct ManifestFile_ {
       auto pod_manifest_filename() {
@@ -37,8 +37,8 @@ template PodManifest() {
             _manifest_path = m.captures["podpath"];
           }
         } else  {
-          writeln("WARNING, issue with manifest_path: ", _pth);
-          _manifest_path = _pth; // _manifest_path = null;
+          writeln("WARNING, issue with manifest_path: ", _pth); // remove?
+          _manifest_path = null; // _manifest_path = "";
         }
         return _manifest_path;
       }
@@ -65,7 +65,7 @@ template PathMatters() {
   auto PathMatters(O,E,P,F)(
     O   _opt_actions,
     E   _env,
-    P   _pth                   = "",
+    P   _pth,
     F   _fns                   = "",
     char[][] _manifest_fn_list = [[]],
   ) {
@@ -115,6 +115,9 @@ template PathMatters() {
           auto manifest_path() {
             return _manifest.pod_manifest_path;
           }
+          auto pod_name() { // TODO decide what returned if src_is_pod == false
+            return _manifest.pod_manifest_path.baseName;
+          }
           auto manifest_file_with_path() {
             return _manifest.pod_manifest_file_with_path;
           }
@@ -190,7 +193,8 @@ template PathMatters() {
               assert(_dir == m.captures["dir"]);
             } else {
               _dir = asNormalizedPath(path_and_fn.chainPath("../../../")).array;
-              assert(_dir == absolute_path_to_src.match(rgx.src_base_parent_dir_name).captures["dir"]);
+              assert(_dir == absolute_path_to_src
+                .match(rgx.src_base_parent_dir_name).captures["dir"]);
             }
             if ((_opt_actions.debug_do)) {
               writeln("--> (base_dir)  ", _dir);
-- 
cgit v1.2.3