From 1fd518d1c2b1d4e88ad88218b606a284b7128107 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 16 Oct 2017 11:19:23 -0400
Subject: Added length field to form table

This commit contains a database update.
---
 generator/form.cpp   | 4 +++-
 generator/form.h     | 6 ++++++
 generator/schema.sql | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'generator')

diff --git a/generator/form.cpp b/generator/form.cpp
index 6be9d47..f616344 100644
--- a/generator/form.cpp
+++ b/generator/form.cpp
@@ -14,7 +14,8 @@ namespace verbly {
       id_(nextId_++),
       text_(text),
       complexity_(std::count(std::begin(text), std::end(text), ' ') + 1),
-      proper_(std::any_of(std::begin(text), std::end(text), std::isupper))
+      proper_(std::any_of(std::begin(text), std::end(text), std::isupper)),
+      length_(text.length())
     {
     }
 
@@ -32,6 +33,7 @@ namespace verbly {
         fields.emplace_back("form", arg.getText());
         fields.emplace_back("complexity", arg.getComplexity());
         fields.emplace_back("proper", arg.isProper());
+        fields.emplace_back("length", arg.getLength());
 
         db.insertIntoTable("forms", std::move(fields));
       }
diff --git a/generator/form.h b/generator/form.h
index 5576035..5a2de30 100644
--- a/generator/form.h
+++ b/generator/form.h
@@ -43,6 +43,11 @@ namespace verbly {
         return proper_;
       }
 
+      int getLength() const
+      {
+        return length_;
+      }
+
       std::set<const pronunciation*> getPronunciations() const
       {
         return pronunciations_;
@@ -56,6 +61,7 @@ namespace verbly {
       const std::string text_;
       const int complexity_;
       const bool proper_;
+      const int length_;
 
       std::set<const pronunciation*> pronunciations_;
 
diff --git a/generator/schema.sql b/generator/schema.sql
index a49a853..c0f2bcb 100644
--- a/generator/schema.sql
+++ b/generator/schema.sql
@@ -155,7 +155,8 @@ CREATE TABLE `forms` (
   `form_id` INTEGER PRIMARY KEY,
   `form` VARCHAR(32) NOT NULL,
   `complexity` SMALLINT NOT NULL,
-  `proper` SMALLINT NOT NULL
+  `proper` SMALLINT NOT NULL,
+  `length` SMALLINT NOT NULL
 );
 
 CREATE UNIQUE INDEX `form_by_string` ON `forms`(`form`);
-- 
cgit 1.4.1