1 files changed, 70 insertions, 1 deletions

@@ -24,6 +24,14 @@ namespace verbly {
         break;
       }
 
+      case type::field:
+      {
+        new(&field_.table_) std::string(other.field_.table_);
+        new(&field_.column_) std::string(other.field_.column_);
+
+        break;
+      }
+
       case type::invalid:
       {
         break;
@@ -50,6 +58,8 @@ namespace verbly {
     type tempType = first.type_;
     int tempInteger;
     std::string tempString;
+    std::string tempTable;
+    std::string tempColumn;
 
     switch (first.type_)
     {
@@ -67,6 +77,14 @@ namespace verbly {
         break;
       }
 
+      case type::field:
+      {
+        tempTable = std::move(first.field_.table_);
+        tempColumn = std::move(first.field_.column_);
+
+        break;
+      }
+
       case type::invalid:
       {
         break;
@@ -93,6 +111,14 @@ namespace verbly {
         break;
       }
 
+      case type::field:
+      {
+        new(&first.field_.table_) std::string(std::move(second.field_.table_));
+        new(&first.field_.column_) std::string(std::move(second.field_.column_));
+
+        break;
+      }
+
       case type::invalid:
       {
         break;
@@ -119,6 +145,14 @@ namespace verbly {
         break;
       }
 
+      case type::field:
+      {
+        new(&first.field_.table_) std::string(std::move(tempTable));
+        new(&first.field_.column_) std::string(std::move(tempColumn));
+
+        break;
+      }
+
       case type::invalid:
       {
         break;
@@ -138,6 +172,15 @@ namespace verbly {
         break;
       }
 
+      case type::field:
+      {
+        using string_type = std::string;
+        field_.table_.~string_type();
+        field_.column_.~string_type();
+
+        break;
+      }
+
       case type::integer:
       case type::invalid:
       {
@@ -164,7 +207,7 @@ namespace verbly {
 
   binding::binding(std::string arg) : type_(type::string)
   {
-    new(&string_) std::string(arg);
+    new(&string_) std::string(std::move(arg));
   }
 
   std::string binding::getString() const
@@ -177,4 +220,30 @@ namespace verbly {
     return string_;
   }
 
+  binding::binding(std::string table, std::string column) : type_(type::field)
+  {
+    new(&field_.table_) std::string(std::move(table));
+    new(&field_.column_) std::string(std::move(column));
+  }
+
+  std::string binding::getTable() const
+  {
+    if (type_ != type::field)
+    {
+      throw std::domain_error("binding::getTable called on non-field binding");
+    }
+
+    return field_.table_;
+  }
+
+  std::string binding::getColumn() const
+  {
+    if (type_ != type::field)
+    {
+      throw std::domain_error("binding::getColumn called on non-field binding");
+    }
+
+    return field_.column_;
+  }
+
 };