fix tutorial and tests

compcmake/CMakeLists.txt

@@ -173,13 +173,20 @@ if(GTest_FOUND)
   ../test/compiler/Readonly_Client.cpp
   ../test/compiler/single_row.cpp
   ../test/compiler/translation.h
-  ../test/compiler/db/blob.cpp
-  ../test/compiler/db/test.cpp
-  ../test/compiler/db/multi_index.cpp
-  ../test/compiler/db/schema_v1.cpp
-  ../test/compiler/db/schema_v2.cpp
-  ../test/compiler/db/vector_test.cpp
-  ../test/compiler/db/empty.cpp
+  ../test/compiler/db/blob/readonly.cpp
+  ../test/compiler/db/blob/writable.cpp
+  ../test/compiler/db/empty/readonly.cpp
+  ../test/compiler/db/empty/writable.cpp
+  ../test/compiler/db/multi_index/readonly.cpp
+  ../test/compiler/db/multi_index/writable.cpp
+  ../test/compiler/db/schema_v1/readonly.cpp
+  ../test/compiler/db/schema_v1/writable.cpp
+  ../test/compiler/db/schema_v2/readonly.cpp
+  ../test/compiler/db/schema_v2/writable.cpp
+  ../test/compiler/db/test/readonly.cpp
+  ../test/compiler/db/test/writable.cpp
+  ../test/compiler/db/vector_test/readonly.cpp
+  ../test/compiler/db/vector_test/writable.cpp
   ../test/compiler/db/test_dbname_base64.cpp
   ../test/compiler/db/test_dbname_ascii.cpp
   ../src/joedb/io/base64_decode.cpp
@@ -221,13 +228,13 @@ if (asio_FOUND)
  endif()
 endif()
 
-joedbc_build(../test/compiler/db test)
+joedbc_build(../test/compiler/db empty)
+joedbc_build(../test/compiler/db blob)
+joedbc_build(../test/compiler/db multi_index)
 joedbc_build(../test/compiler/db schema_v1)
 joedbc_build(../test/compiler/db schema_v2)
+joedbc_build(../test/compiler/db test)
 joedbc_build(../test/compiler/db vector_test)
-joedbc_build(../test/compiler/db multi_index)
-joedbc_build(../test/compiler/db empty)
-joedbc_build(../test/compiler/db blob)
 joedbc_build(../benchmark benchmarkdb)
 joedbc_build(../doc/source/tutorial tutorial)
 joedbc_build(../doc/source/tutorial settings)
@@ -320,7 +327,8 @@ joedb_add_executable(index_tutorial
 )
 
 joedb_add_executable(joedb_generate_translation_header
- ../test/compiler/db/test.cpp
+ ../test/compiler/db/test/readonly.cpp
+ ../test/compiler/db/test/writable.cpp
  ../test/compiler/generate_translation_header.cpp
 )
 
@@ -331,7 +339,8 @@ joedb_add_executable(joedbc_insert
 )
 
 joedb_add_executable(update_large_string
- ../test/compiler/db/schema_v1.cpp
+ ../test/compiler/db/schema_v1/readonly.cpp
+ ../test/compiler/db/schema_v1/writable.cpp
  ../test/compiler/update_large_string.cpp
 )
 

doc/source/tutorial/CMakeLists.txt

@@ -32,14 +32,38 @@ include("../../../compcmake/joedbc.cmake")
 joedbc_build("." tutorial)
 joedbc_build("." settings)
 
-joedb_add_executable(tutorial tutorial_main.cpp tutorial.cpp)
+joedb_add_executable(tutorial
+ tutorial_main.cpp
+ tutorial/readonly.cpp
+ tutorial/writable.cpp
+)
 
-joedb_add_executable(local_concurrency local_concurrency.cpp tutorial.cpp)
+joedb_add_executable(local_concurrency
+ local_concurrency.cpp
+ tutorial/readonly.cpp
+ tutorial/writable.cpp
+)
 
-joedb_add_executable(file_tutorial file_tutorial.cpp tutorial.cpp)
+joedb_add_executable(file_tutorial
+ file_tutorial.cpp
+ tutorial/readonly.cpp
+ tutorial/writable.cpp
+)
 
-joedb_add_executable(concurrency_tutorial concurrency_tutorial.cpp tutorial.cpp)
+joedb_add_executable(concurrency_tutorial
+ concurrency_tutorial.cpp
+ tutorial/readonly.cpp
+ tutorial/writable.cpp
+)
 
-joedb_add_executable(index_tutorial index_tutorial.cpp tutorial.cpp)
+joedb_add_executable(index_tutorial
+ index_tutorial.cpp
+ tutorial/readonly.cpp
+ tutorial/writable.cpp
+)
 
-joedb_add_executable(settings settings_main.cpp settings.cpp)
+joedb_add_executable(settings
+ settings_main.cpp
+ settings/readonly.cpp
+ settings/writable.cpp
+)

src/joedb/compiler/joedb_embed.cpp

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
   }
 
   cpp << "#include \"" << file_name.str() << ".h\"\n";
-  cpp << "#include \"" << name_space.back() << "_readonly.h\"\n";
+  cpp << "#include \"" << name_space.back() << "/readonly.h\"\n";
   cpp << "#include \"joedb/journal/Readonly_Memory_File.h\"\n";
   if (mode == base64)
    cpp << "#include \"joedb/io/base64.h\"\n";

test/compiler/Blob.cpp

@@ -1,4 +1,4 @@
-#include "db/blob.h"
+#include "db/blob/writable.h"
 #include "joedb/journal/Memory_File.h"
 
 #include "gtest/gtest.h"

test/compiler/Compiler_GTest.cpp

@@ -1,9 +1,9 @@
-#include "db/test.h"
-#include "db/multi_index.h"
-#include "db/schema_v1.h"
-#include "db/schema_v2.h"
-#include "db/test_readonly.h"
-#include "db/vector_test.h"
+#include "db/test/writable.h"
+#include "db/multi_index/writable.h"
+#include "db/schema_v1/writable.h"
+#include "db/schema_v2/writable.h"
+#include "db/test/readonly.h"
+#include "db/vector_test/writable.h"
 #include "translation.h"
 #include "joedb/journal/Readonly_Interpreted_File.h"
 #include "joedb/concurrency/File_Connection.h"

test/compiler/Readonly_Client.cpp

@@ -1,4 +1,4 @@
-#include "db/test.h"
+#include "db/test/writable.h"
 
 #include "gtest/gtest.h"
 

test/compiler/embedded_GTest.cpp

@@ -1,6 +1,6 @@
 #include "db/test_dbname_base64.h"
 #include "db/test_dbname_ascii.h"
-#include "db/test.h"
+#include "db/test/readonly.h"
 
 #include "gtest/gtest.h"
 

test/compiler/generate_translation_header.cpp

@@ -1,4 +1,4 @@
-#include "db/test_readonly.h"
+#include "db/test/readonly.h"
 #include "joedb/io/main_exception_catcher.h"
 
 #include <iostream>
@@ -12,7 +12,7 @@ static int generate_translation_header(int argc, char **argv)
  std::cout << "#ifndef translation_declared\n";
  std::cout << "#define translation_declared\n\n";
 
- std::cout << "#include \"db/test.h\"\n\n";
+ std::cout << "#include \"db/test/readonly.h\"\n\n";
 
  std::cout << "namespace my_namespace\n";
  std::cout << "{\n";

test/compiler/update_large_string.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "db/schema_v1.h"
+#include "db/schema_v1/writable.h"
 
 /////////////////////////////////////////////////////////////////////////////
 int main()