From 9a0c2b6bcdc0b961d374a1a17a7156ae893d8bff Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sun, 28 Jan 2018 21:00:54 -0500
Subject: [PATCH] moved migration directory to db, fix sync records

---
 .../migrations}/0001__cleanup_tables.sql           |  0
 .../0002__cleanup_unused_columns_from_notes.sql    |  0
 .../migrations}/0003__add_is_deleted_to_note.sql   |  0
 .../0004__add_date_modified_to_notes_tree.sql      |  0
 .../migrations}/0005__cleanup_options.sql          |  0
 ...0006__date_modified_from_to_in_note_history.sql |  0
 .../0007__readd_encryption_to_note_history.sql     |  0
 .../migrations}/0008__fix_note_history.sql         |  0
 {migrations => db/migrations}/0009__indexes.sql    |  0
 .../0010__add_is_deleted_to_notes_tree.sql         |  0
 .../migrations}/0011__add_last_synced_option.sql   |  0
 .../0012__create_index_on_notes_history.sql        |  0
 .../migrations}/0013__last_sync_pulled_pushed.sql  |  0
 .../migrations}/0014__change_audit_log_id.sql      |  0
 .../migrations}/0015__trim_note_ids.sql            |  0
 .../migrations}/0016__trim_note_ids2.sql           |  0
 .../migrations}/0017__document_id.sql              |  0
 .../migrations}/0018__document_secret.sql          |  0
 .../0019__date_modified_for_options.sql            |  0
 {migrations => db/migrations}/0020__sync.sql       |  0
 .../migrations}/0021__sync_add_source_id.sql       |  0
 .../migrations}/0022__add_note_history_id.sql      |  0
 .../0023__remove_id_from_note_history.sql          |  0
 .../migrations}/0024__remove_id_from_options.sql   |  0
 .../migrations}/0025__create_event_log.sql         |  0
 .../migrations}/0026__recent_notes_table.sql       |  0
 .../0027__is_deleted_in_recent_notes.sql           |  0
 .../0028__rename_encryption_to_protected.sql       |  0
 ...ession_timeout_to_protected_session_timeout.sql |  0
 {migrations => db/migrations}/0030__hello_world.js |  0
 .../migrations}/0031__change_encryption_to_CBC.js  |  0
 .../0032__add_option_for_encrypted_data_key_iv.sql |  0
 .../0033__change_data_key_encryption_to_cbc.js     |  0
 {migrations => db/migrations}/0034__source_ids.sql |  0
 .../0035__root_notes_will_have_note_id_root.sql    |  0
 .../migrations}/0036__clear_sync_table.sql         |  0
 .../migrations}/0037__add_note_tree_id.sql         |  0
 .../migrations}/0038__rename_start_node.sql        |  0
 ...__recent_notes_should_point_to_note_tree_id.sql |  0
 .../migrations}/0040__fix_note_pid.sql             |  0
 .../0041__recent_notes_with_note_path.sql          |  0
 .../0042__remove_unique_index_on_note_id.sql       |  0
 .../migrations}/0043__clear_sync_table.sql         |  0
 .../migrations}/0044__drop_audit_log.sql           |  0
 .../migrations}/0045__add_prefix_to_notes_tree.sql |  0
 .../migrations}/0046__drop_links_and_images.sql    |  0
 {migrations => db/migrations}/0047__test.sql       |  0
 .../0048__add_note_tree_id_to_recent_notes.sql     |  0
 ...049__rename_start_note_tree_id_to_note_path.sql |  0
 .../migrations}/0050__string_dates.sql             |  0
 .../0051__note_id_index_on_notes_tree.sql          |  0
 .../migrations}/0052__fill_sync_table.sql          |  0
 .../migrations}/0053__cleanup_inconsistencies.sql  |  0
 .../0054__more_cleanup_inconsistencies.sql         |  0
 .../migrations}/0055__set_last_synced_push.sql     |  0
 .../migrations}/0056__fill_sync_again.sql          |  0
 .../migrations}/0057__add_foreign_keys.sql         |  0
 .../0058__remove_foreign_key_from_notes_tree.sql   |  0
 .../migrations}/0059__remove_foreign_key_again.sql |  0
 .../0060__remove_rest_of_foreign_keys.sql          |  0
 .../migrations}/0061__change_index_to_unique.sql   |  0
 .../0062__change_index_back_to_non_unique.sql      |  0
 .../migrations}/0063__image_table.sql              |  0
 .../0064__add_note_id_to_image_table.sql           |  0
 .../migrations}/0065__notes_image.sql              |  0
 .../migrations}/0066__create_attributes_table.sql  |  0
 .../migrations}/0067__add_is_synced_to_options.sql |  0
 .../migrations}/0068__add_note_type.sql            |  0
 .../migrations}/0069__add_mime_to_note.sql         |  0
 .../0070__rename_columns_to_camel_case.sql         |  0
 db/migrations/0071__fix_sync_entity_names.sql      |  3 +++
 routes/api/login.js                                |  4 ++--
 routes/index.js                                    |  4 ++--
 services/app_info.js                               |  2 +-
 services/resource_dir.js                           | 14 +++++++-------
 services/sync.js                                   |  6 +++---
 services/sync_table.js                             |  4 ++--
 77 files changed, 20 insertions(+), 17 deletions(-)
 rename {migrations => db/migrations}/0001__cleanup_tables.sql (100%)
 rename {migrations => db/migrations}/0002__cleanup_unused_columns_from_notes.sql (100%)
 rename {migrations => db/migrations}/0003__add_is_deleted_to_note.sql (100%)
 rename {migrations => db/migrations}/0004__add_date_modified_to_notes_tree.sql (100%)
 rename {migrations => db/migrations}/0005__cleanup_options.sql (100%)
 rename {migrations => db/migrations}/0006__date_modified_from_to_in_note_history.sql (100%)
 rename {migrations => db/migrations}/0007__readd_encryption_to_note_history.sql (100%)
 rename {migrations => db/migrations}/0008__fix_note_history.sql (100%)
 rename {migrations => db/migrations}/0009__indexes.sql (100%)
 rename {migrations => db/migrations}/0010__add_is_deleted_to_notes_tree.sql (100%)
 rename {migrations => db/migrations}/0011__add_last_synced_option.sql (100%)
 rename {migrations => db/migrations}/0012__create_index_on_notes_history.sql (100%)
 rename {migrations => db/migrations}/0013__last_sync_pulled_pushed.sql (100%)
 rename {migrations => db/migrations}/0014__change_audit_log_id.sql (100%)
 rename {migrations => db/migrations}/0015__trim_note_ids.sql (100%)
 rename {migrations => db/migrations}/0016__trim_note_ids2.sql (100%)
 rename {migrations => db/migrations}/0017__document_id.sql (100%)
 rename {migrations => db/migrations}/0018__document_secret.sql (100%)
 rename {migrations => db/migrations}/0019__date_modified_for_options.sql (100%)
 rename {migrations => db/migrations}/0020__sync.sql (100%)
 rename {migrations => db/migrations}/0021__sync_add_source_id.sql (100%)
 rename {migrations => db/migrations}/0022__add_note_history_id.sql (100%)
 rename {migrations => db/migrations}/0023__remove_id_from_note_history.sql (100%)
 rename {migrations => db/migrations}/0024__remove_id_from_options.sql (100%)
 rename {migrations => db/migrations}/0025__create_event_log.sql (100%)
 rename {migrations => db/migrations}/0026__recent_notes_table.sql (100%)
 rename {migrations => db/migrations}/0027__is_deleted_in_recent_notes.sql (100%)
 rename {migrations => db/migrations}/0028__rename_encryption_to_protected.sql (100%)
 rename {migrations => db/migrations}/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql (100%)
 rename {migrations => db/migrations}/0030__hello_world.js (100%)
 rename {migrations => db/migrations}/0031__change_encryption_to_CBC.js (100%)
 rename {migrations => db/migrations}/0032__add_option_for_encrypted_data_key_iv.sql (100%)
 rename {migrations => db/migrations}/0033__change_data_key_encryption_to_cbc.js (100%)
 rename {migrations => db/migrations}/0034__source_ids.sql (100%)
 rename {migrations => db/migrations}/0035__root_notes_will_have_note_id_root.sql (100%)
 rename {migrations => db/migrations}/0036__clear_sync_table.sql (100%)
 rename {migrations => db/migrations}/0037__add_note_tree_id.sql (100%)
 rename {migrations => db/migrations}/0038__rename_start_node.sql (100%)
 rename {migrations => db/migrations}/0039__recent_notes_should_point_to_note_tree_id.sql (100%)
 rename {migrations => db/migrations}/0040__fix_note_pid.sql (100%)
 rename {migrations => db/migrations}/0041__recent_notes_with_note_path.sql (100%)
 rename {migrations => db/migrations}/0042__remove_unique_index_on_note_id.sql (100%)
 rename {migrations => db/migrations}/0043__clear_sync_table.sql (100%)
 rename {migrations => db/migrations}/0044__drop_audit_log.sql (100%)
 rename {migrations => db/migrations}/0045__add_prefix_to_notes_tree.sql (100%)
 rename {migrations => db/migrations}/0046__drop_links_and_images.sql (100%)
 rename {migrations => db/migrations}/0047__test.sql (100%)
 rename {migrations => db/migrations}/0048__add_note_tree_id_to_recent_notes.sql (100%)
 rename {migrations => db/migrations}/0049__rename_start_note_tree_id_to_note_path.sql (100%)
 rename {migrations => db/migrations}/0050__string_dates.sql (100%)
 rename {migrations => db/migrations}/0051__note_id_index_on_notes_tree.sql (100%)
 rename {migrations => db/migrations}/0052__fill_sync_table.sql (100%)
 rename {migrations => db/migrations}/0053__cleanup_inconsistencies.sql (100%)
 rename {migrations => db/migrations}/0054__more_cleanup_inconsistencies.sql (100%)
 rename {migrations => db/migrations}/0055__set_last_synced_push.sql (100%)
 rename {migrations => db/migrations}/0056__fill_sync_again.sql (100%)
 rename {migrations => db/migrations}/0057__add_foreign_keys.sql (100%)
 rename {migrations => db/migrations}/0058__remove_foreign_key_from_notes_tree.sql (100%)
 rename {migrations => db/migrations}/0059__remove_foreign_key_again.sql (100%)
 rename {migrations => db/migrations}/0060__remove_rest_of_foreign_keys.sql (100%)
 rename {migrations => db/migrations}/0061__change_index_to_unique.sql (100%)
 rename {migrations => db/migrations}/0062__change_index_back_to_non_unique.sql (100%)
 rename {migrations => db/migrations}/0063__image_table.sql (100%)
 rename {migrations => db/migrations}/0064__add_note_id_to_image_table.sql (100%)
 rename {migrations => db/migrations}/0065__notes_image.sql (100%)
 rename {migrations => db/migrations}/0066__create_attributes_table.sql (100%)
 rename {migrations => db/migrations}/0067__add_is_synced_to_options.sql (100%)
 rename {migrations => db/migrations}/0068__add_note_type.sql (100%)
 rename {migrations => db/migrations}/0069__add_mime_to_note.sql (100%)
 rename {migrations => db/migrations}/0070__rename_columns_to_camel_case.sql (100%)
 create mode 100644 db/migrations/0071__fix_sync_entity_names.sql

diff --git a/migrations/0001__cleanup_tables.sql b/db/migrations/0001__cleanup_tables.sql
similarity index 100%
rename from migrations/0001__cleanup_tables.sql
rename to db/migrations/0001__cleanup_tables.sql
diff --git a/migrations/0002__cleanup_unused_columns_from_notes.sql b/db/migrations/0002__cleanup_unused_columns_from_notes.sql
similarity index 100%
rename from migrations/0002__cleanup_unused_columns_from_notes.sql
rename to db/migrations/0002__cleanup_unused_columns_from_notes.sql
diff --git a/migrations/0003__add_is_deleted_to_note.sql b/db/migrations/0003__add_is_deleted_to_note.sql
similarity index 100%
rename from migrations/0003__add_is_deleted_to_note.sql
rename to db/migrations/0003__add_is_deleted_to_note.sql
diff --git a/migrations/0004__add_date_modified_to_notes_tree.sql b/db/migrations/0004__add_date_modified_to_notes_tree.sql
similarity index 100%
rename from migrations/0004__add_date_modified_to_notes_tree.sql
rename to db/migrations/0004__add_date_modified_to_notes_tree.sql
diff --git a/migrations/0005__cleanup_options.sql b/db/migrations/0005__cleanup_options.sql
similarity index 100%
rename from migrations/0005__cleanup_options.sql
rename to db/migrations/0005__cleanup_options.sql
diff --git a/migrations/0006__date_modified_from_to_in_note_history.sql b/db/migrations/0006__date_modified_from_to_in_note_history.sql
similarity index 100%
rename from migrations/0006__date_modified_from_to_in_note_history.sql
rename to db/migrations/0006__date_modified_from_to_in_note_history.sql
diff --git a/migrations/0007__readd_encryption_to_note_history.sql b/db/migrations/0007__readd_encryption_to_note_history.sql
similarity index 100%
rename from migrations/0007__readd_encryption_to_note_history.sql
rename to db/migrations/0007__readd_encryption_to_note_history.sql
diff --git a/migrations/0008__fix_note_history.sql b/db/migrations/0008__fix_note_history.sql
similarity index 100%
rename from migrations/0008__fix_note_history.sql
rename to db/migrations/0008__fix_note_history.sql
diff --git a/migrations/0009__indexes.sql b/db/migrations/0009__indexes.sql
similarity index 100%
rename from migrations/0009__indexes.sql
rename to db/migrations/0009__indexes.sql
diff --git a/migrations/0010__add_is_deleted_to_notes_tree.sql b/db/migrations/0010__add_is_deleted_to_notes_tree.sql
similarity index 100%
rename from migrations/0010__add_is_deleted_to_notes_tree.sql
rename to db/migrations/0010__add_is_deleted_to_notes_tree.sql
diff --git a/migrations/0011__add_last_synced_option.sql b/db/migrations/0011__add_last_synced_option.sql
similarity index 100%
rename from migrations/0011__add_last_synced_option.sql
rename to db/migrations/0011__add_last_synced_option.sql
diff --git a/migrations/0012__create_index_on_notes_history.sql b/db/migrations/0012__create_index_on_notes_history.sql
similarity index 100%
rename from migrations/0012__create_index_on_notes_history.sql
rename to db/migrations/0012__create_index_on_notes_history.sql
diff --git a/migrations/0013__last_sync_pulled_pushed.sql b/db/migrations/0013__last_sync_pulled_pushed.sql
similarity index 100%
rename from migrations/0013__last_sync_pulled_pushed.sql
rename to db/migrations/0013__last_sync_pulled_pushed.sql
diff --git a/migrations/0014__change_audit_log_id.sql b/db/migrations/0014__change_audit_log_id.sql
similarity index 100%
rename from migrations/0014__change_audit_log_id.sql
rename to db/migrations/0014__change_audit_log_id.sql
diff --git a/migrations/0015__trim_note_ids.sql b/db/migrations/0015__trim_note_ids.sql
similarity index 100%
rename from migrations/0015__trim_note_ids.sql
rename to db/migrations/0015__trim_note_ids.sql
diff --git a/migrations/0016__trim_note_ids2.sql b/db/migrations/0016__trim_note_ids2.sql
similarity index 100%
rename from migrations/0016__trim_note_ids2.sql
rename to db/migrations/0016__trim_note_ids2.sql
diff --git a/migrations/0017__document_id.sql b/db/migrations/0017__document_id.sql
similarity index 100%
rename from migrations/0017__document_id.sql
rename to db/migrations/0017__document_id.sql
diff --git a/migrations/0018__document_secret.sql b/db/migrations/0018__document_secret.sql
similarity index 100%
rename from migrations/0018__document_secret.sql
rename to db/migrations/0018__document_secret.sql
diff --git a/migrations/0019__date_modified_for_options.sql b/db/migrations/0019__date_modified_for_options.sql
similarity index 100%
rename from migrations/0019__date_modified_for_options.sql
rename to db/migrations/0019__date_modified_for_options.sql
diff --git a/migrations/0020__sync.sql b/db/migrations/0020__sync.sql
similarity index 100%
rename from migrations/0020__sync.sql
rename to db/migrations/0020__sync.sql
diff --git a/migrations/0021__sync_add_source_id.sql b/db/migrations/0021__sync_add_source_id.sql
similarity index 100%
rename from migrations/0021__sync_add_source_id.sql
rename to db/migrations/0021__sync_add_source_id.sql
diff --git a/migrations/0022__add_note_history_id.sql b/db/migrations/0022__add_note_history_id.sql
similarity index 100%
rename from migrations/0022__add_note_history_id.sql
rename to db/migrations/0022__add_note_history_id.sql
diff --git a/migrations/0023__remove_id_from_note_history.sql b/db/migrations/0023__remove_id_from_note_history.sql
similarity index 100%
rename from migrations/0023__remove_id_from_note_history.sql
rename to db/migrations/0023__remove_id_from_note_history.sql
diff --git a/migrations/0024__remove_id_from_options.sql b/db/migrations/0024__remove_id_from_options.sql
similarity index 100%
rename from migrations/0024__remove_id_from_options.sql
rename to db/migrations/0024__remove_id_from_options.sql
diff --git a/migrations/0025__create_event_log.sql b/db/migrations/0025__create_event_log.sql
similarity index 100%
rename from migrations/0025__create_event_log.sql
rename to db/migrations/0025__create_event_log.sql
diff --git a/migrations/0026__recent_notes_table.sql b/db/migrations/0026__recent_notes_table.sql
similarity index 100%
rename from migrations/0026__recent_notes_table.sql
rename to db/migrations/0026__recent_notes_table.sql
diff --git a/migrations/0027__is_deleted_in_recent_notes.sql b/db/migrations/0027__is_deleted_in_recent_notes.sql
similarity index 100%
rename from migrations/0027__is_deleted_in_recent_notes.sql
rename to db/migrations/0027__is_deleted_in_recent_notes.sql
diff --git a/migrations/0028__rename_encryption_to_protected.sql b/db/migrations/0028__rename_encryption_to_protected.sql
similarity index 100%
rename from migrations/0028__rename_encryption_to_protected.sql
rename to db/migrations/0028__rename_encryption_to_protected.sql
diff --git a/migrations/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql b/db/migrations/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql
similarity index 100%
rename from migrations/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql
rename to db/migrations/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql
diff --git a/migrations/0030__hello_world.js b/db/migrations/0030__hello_world.js
similarity index 100%
rename from migrations/0030__hello_world.js
rename to db/migrations/0030__hello_world.js
diff --git a/migrations/0031__change_encryption_to_CBC.js b/db/migrations/0031__change_encryption_to_CBC.js
similarity index 100%
rename from migrations/0031__change_encryption_to_CBC.js
rename to db/migrations/0031__change_encryption_to_CBC.js
diff --git a/migrations/0032__add_option_for_encrypted_data_key_iv.sql b/db/migrations/0032__add_option_for_encrypted_data_key_iv.sql
similarity index 100%
rename from migrations/0032__add_option_for_encrypted_data_key_iv.sql
rename to db/migrations/0032__add_option_for_encrypted_data_key_iv.sql
diff --git a/migrations/0033__change_data_key_encryption_to_cbc.js b/db/migrations/0033__change_data_key_encryption_to_cbc.js
similarity index 100%
rename from migrations/0033__change_data_key_encryption_to_cbc.js
rename to db/migrations/0033__change_data_key_encryption_to_cbc.js
diff --git a/migrations/0034__source_ids.sql b/db/migrations/0034__source_ids.sql
similarity index 100%
rename from migrations/0034__source_ids.sql
rename to db/migrations/0034__source_ids.sql
diff --git a/migrations/0035__root_notes_will_have_note_id_root.sql b/db/migrations/0035__root_notes_will_have_note_id_root.sql
similarity index 100%
rename from migrations/0035__root_notes_will_have_note_id_root.sql
rename to db/migrations/0035__root_notes_will_have_note_id_root.sql
diff --git a/migrations/0036__clear_sync_table.sql b/db/migrations/0036__clear_sync_table.sql
similarity index 100%
rename from migrations/0036__clear_sync_table.sql
rename to db/migrations/0036__clear_sync_table.sql
diff --git a/migrations/0037__add_note_tree_id.sql b/db/migrations/0037__add_note_tree_id.sql
similarity index 100%
rename from migrations/0037__add_note_tree_id.sql
rename to db/migrations/0037__add_note_tree_id.sql
diff --git a/migrations/0038__rename_start_node.sql b/db/migrations/0038__rename_start_node.sql
similarity index 100%
rename from migrations/0038__rename_start_node.sql
rename to db/migrations/0038__rename_start_node.sql
diff --git a/migrations/0039__recent_notes_should_point_to_note_tree_id.sql b/db/migrations/0039__recent_notes_should_point_to_note_tree_id.sql
similarity index 100%
rename from migrations/0039__recent_notes_should_point_to_note_tree_id.sql
rename to db/migrations/0039__recent_notes_should_point_to_note_tree_id.sql
diff --git a/migrations/0040__fix_note_pid.sql b/db/migrations/0040__fix_note_pid.sql
similarity index 100%
rename from migrations/0040__fix_note_pid.sql
rename to db/migrations/0040__fix_note_pid.sql
diff --git a/migrations/0041__recent_notes_with_note_path.sql b/db/migrations/0041__recent_notes_with_note_path.sql
similarity index 100%
rename from migrations/0041__recent_notes_with_note_path.sql
rename to db/migrations/0041__recent_notes_with_note_path.sql
diff --git a/migrations/0042__remove_unique_index_on_note_id.sql b/db/migrations/0042__remove_unique_index_on_note_id.sql
similarity index 100%
rename from migrations/0042__remove_unique_index_on_note_id.sql
rename to db/migrations/0042__remove_unique_index_on_note_id.sql
diff --git a/migrations/0043__clear_sync_table.sql b/db/migrations/0043__clear_sync_table.sql
similarity index 100%
rename from migrations/0043__clear_sync_table.sql
rename to db/migrations/0043__clear_sync_table.sql
diff --git a/migrations/0044__drop_audit_log.sql b/db/migrations/0044__drop_audit_log.sql
similarity index 100%
rename from migrations/0044__drop_audit_log.sql
rename to db/migrations/0044__drop_audit_log.sql
diff --git a/migrations/0045__add_prefix_to_notes_tree.sql b/db/migrations/0045__add_prefix_to_notes_tree.sql
similarity index 100%
rename from migrations/0045__add_prefix_to_notes_tree.sql
rename to db/migrations/0045__add_prefix_to_notes_tree.sql
diff --git a/migrations/0046__drop_links_and_images.sql b/db/migrations/0046__drop_links_and_images.sql
similarity index 100%
rename from migrations/0046__drop_links_and_images.sql
rename to db/migrations/0046__drop_links_and_images.sql
diff --git a/migrations/0047__test.sql b/db/migrations/0047__test.sql
similarity index 100%
rename from migrations/0047__test.sql
rename to db/migrations/0047__test.sql
diff --git a/migrations/0048__add_note_tree_id_to_recent_notes.sql b/db/migrations/0048__add_note_tree_id_to_recent_notes.sql
similarity index 100%
rename from migrations/0048__add_note_tree_id_to_recent_notes.sql
rename to db/migrations/0048__add_note_tree_id_to_recent_notes.sql
diff --git a/migrations/0049__rename_start_note_tree_id_to_note_path.sql b/db/migrations/0049__rename_start_note_tree_id_to_note_path.sql
similarity index 100%
rename from migrations/0049__rename_start_note_tree_id_to_note_path.sql
rename to db/migrations/0049__rename_start_note_tree_id_to_note_path.sql
diff --git a/migrations/0050__string_dates.sql b/db/migrations/0050__string_dates.sql
similarity index 100%
rename from migrations/0050__string_dates.sql
rename to db/migrations/0050__string_dates.sql
diff --git a/migrations/0051__note_id_index_on_notes_tree.sql b/db/migrations/0051__note_id_index_on_notes_tree.sql
similarity index 100%
rename from migrations/0051__note_id_index_on_notes_tree.sql
rename to db/migrations/0051__note_id_index_on_notes_tree.sql
diff --git a/migrations/0052__fill_sync_table.sql b/db/migrations/0052__fill_sync_table.sql
similarity index 100%
rename from migrations/0052__fill_sync_table.sql
rename to db/migrations/0052__fill_sync_table.sql
diff --git a/migrations/0053__cleanup_inconsistencies.sql b/db/migrations/0053__cleanup_inconsistencies.sql
similarity index 100%
rename from migrations/0053__cleanup_inconsistencies.sql
rename to db/migrations/0053__cleanup_inconsistencies.sql
diff --git a/migrations/0054__more_cleanup_inconsistencies.sql b/db/migrations/0054__more_cleanup_inconsistencies.sql
similarity index 100%
rename from migrations/0054__more_cleanup_inconsistencies.sql
rename to db/migrations/0054__more_cleanup_inconsistencies.sql
diff --git a/migrations/0055__set_last_synced_push.sql b/db/migrations/0055__set_last_synced_push.sql
similarity index 100%
rename from migrations/0055__set_last_synced_push.sql
rename to db/migrations/0055__set_last_synced_push.sql
diff --git a/migrations/0056__fill_sync_again.sql b/db/migrations/0056__fill_sync_again.sql
similarity index 100%
rename from migrations/0056__fill_sync_again.sql
rename to db/migrations/0056__fill_sync_again.sql
diff --git a/migrations/0057__add_foreign_keys.sql b/db/migrations/0057__add_foreign_keys.sql
similarity index 100%
rename from migrations/0057__add_foreign_keys.sql
rename to db/migrations/0057__add_foreign_keys.sql
diff --git a/migrations/0058__remove_foreign_key_from_notes_tree.sql b/db/migrations/0058__remove_foreign_key_from_notes_tree.sql
similarity index 100%
rename from migrations/0058__remove_foreign_key_from_notes_tree.sql
rename to db/migrations/0058__remove_foreign_key_from_notes_tree.sql
diff --git a/migrations/0059__remove_foreign_key_again.sql b/db/migrations/0059__remove_foreign_key_again.sql
similarity index 100%
rename from migrations/0059__remove_foreign_key_again.sql
rename to db/migrations/0059__remove_foreign_key_again.sql
diff --git a/migrations/0060__remove_rest_of_foreign_keys.sql b/db/migrations/0060__remove_rest_of_foreign_keys.sql
similarity index 100%
rename from migrations/0060__remove_rest_of_foreign_keys.sql
rename to db/migrations/0060__remove_rest_of_foreign_keys.sql
diff --git a/migrations/0061__change_index_to_unique.sql b/db/migrations/0061__change_index_to_unique.sql
similarity index 100%
rename from migrations/0061__change_index_to_unique.sql
rename to db/migrations/0061__change_index_to_unique.sql
diff --git a/migrations/0062__change_index_back_to_non_unique.sql b/db/migrations/0062__change_index_back_to_non_unique.sql
similarity index 100%
rename from migrations/0062__change_index_back_to_non_unique.sql
rename to db/migrations/0062__change_index_back_to_non_unique.sql
diff --git a/migrations/0063__image_table.sql b/db/migrations/0063__image_table.sql
similarity index 100%
rename from migrations/0063__image_table.sql
rename to db/migrations/0063__image_table.sql
diff --git a/migrations/0064__add_note_id_to_image_table.sql b/db/migrations/0064__add_note_id_to_image_table.sql
similarity index 100%
rename from migrations/0064__add_note_id_to_image_table.sql
rename to db/migrations/0064__add_note_id_to_image_table.sql
diff --git a/migrations/0065__notes_image.sql b/db/migrations/0065__notes_image.sql
similarity index 100%
rename from migrations/0065__notes_image.sql
rename to db/migrations/0065__notes_image.sql
diff --git a/migrations/0066__create_attributes_table.sql b/db/migrations/0066__create_attributes_table.sql
similarity index 100%
rename from migrations/0066__create_attributes_table.sql
rename to db/migrations/0066__create_attributes_table.sql
diff --git a/migrations/0067__add_is_synced_to_options.sql b/db/migrations/0067__add_is_synced_to_options.sql
similarity index 100%
rename from migrations/0067__add_is_synced_to_options.sql
rename to db/migrations/0067__add_is_synced_to_options.sql
diff --git a/migrations/0068__add_note_type.sql b/db/migrations/0068__add_note_type.sql
similarity index 100%
rename from migrations/0068__add_note_type.sql
rename to db/migrations/0068__add_note_type.sql
diff --git a/migrations/0069__add_mime_to_note.sql b/db/migrations/0069__add_mime_to_note.sql
similarity index 100%
rename from migrations/0069__add_mime_to_note.sql
rename to db/migrations/0069__add_mime_to_note.sql
diff --git a/migrations/0070__rename_columns_to_camel_case.sql b/db/migrations/0070__rename_columns_to_camel_case.sql
similarity index 100%
rename from migrations/0070__rename_columns_to_camel_case.sql
rename to db/migrations/0070__rename_columns_to_camel_case.sql
diff --git a/db/migrations/0071__fix_sync_entity_names.sql b/db/migrations/0071__fix_sync_entity_names.sql
new file mode 100644
index 000000000..ac09c20d6
--- /dev/null
+++ b/db/migrations/0071__fix_sync_entity_names.sql
@@ -0,0 +1,3 @@
+UPDATE sync SET entityName = 'note_images' WHERE entityName = 'notes_image';
+UPDATE sync SET entityName = 'note_tree' WHERE entityName = 'notes_tree';
+UPDATE sync SET entityName = 'note_revisions' WHERE entityName = 'notes_history';
\ No newline at end of file
diff --git a/routes/api/login.js b/routes/api/login.js
index 3c21531cf..c632c5665 100644
--- a/routes/api/login.js
+++ b/routes/api/login.js
@@ -4,7 +4,7 @@ const express = require('express');
 const router = express.Router();
 const options = require('../../services/options');
 const utils = require('../../services/utils');
-const sourceId = require('../../services/source_id');
+const source_id = require('../../services/source_id');
 const auth = require('../../services/auth');
 const password_encryption = require('../../services/password_encryption');
 const protected_session = require('../../services/protected_session');
@@ -43,7 +43,7 @@ router.post('/sync', wrap(async (req, res, next) => {
     req.session.loggedIn = true;
 
     res.send({
-        sourceId: sourceId.getCurrentSourceId()
+        sourceId: source_id.getCurrentSourceId()
     });
 }));
 
diff --git a/routes/index.js b/routes/index.js
index 2928f80b5..162462e9d 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -3,13 +3,13 @@
 const express = require('express');
 const router = express.Router();
 const auth = require('../services/auth');
-const sourceId = require('../services/source_id');
+const source_id = require('../services/source_id');
 const sql = require('../services/sql');
 const wrap = require('express-promise-wrap').wrap;
 
 router.get('', auth.checkAuth, wrap(async (req, res, next) => {
     res.render('index', {
-        sourceId: await sourceId.generateSourceId(),
+        sourceId: await source_id.generateSourceId(),
         maxSyncIdAtLoad: await sql.getFirstValue("SELECT MAX(id) FROM sync")
     });
 }));
diff --git a/services/app_info.js b/services/app_info.js
index 5e30423ea..63091da7f 100644
--- a/services/app_info.js
+++ b/services/app_info.js
@@ -3,7 +3,7 @@
 const build = require('./build');
 const packageJson = require('../package');
 
-const APP_DB_VERSION = 70;
+const APP_DB_VERSION = 71;
 
 module.exports = {
     app_version: packageJson.version,
diff --git a/services/resource_dir.js b/services/resource_dir.js
index bb9bd029b..1a3f1a495 100644
--- a/services/resource_dir.js
+++ b/services/resource_dir.js
@@ -4,13 +4,6 @@ const fs = require('fs');
 
 const RESOURCE_DIR = path.resolve(__dirname, "..");
 
-const MIGRATIONS_DIR = path.resolve(RESOURCE_DIR, "migrations");
-
-if (!fs.existsSync(MIGRATIONS_DIR)) {
-    log.error("Could not find migration directory: " + MIGRATIONS_DIR);
-    process.exit(1);
-}
-
 const DB_INIT_DIR = path.resolve(RESOURCE_DIR, "db");
 
 if (!fs.existsSync(DB_INIT_DIR)) {
@@ -18,6 +11,13 @@ if (!fs.existsSync(DB_INIT_DIR)) {
     process.exit(1);
 }
 
+const MIGRATIONS_DIR = path.resolve(DB_INIT_DIR, "migrations");
+
+if (!fs.existsSync(MIGRATIONS_DIR)) {
+    log.error("Could not find migration directory: " + MIGRATIONS_DIR);
+    process.exit(1);
+}
+
 module.exports = {
     RESOURCE_DIR,
     MIGRATIONS_DIR,
diff --git a/services/sync.js b/services/sync.js
index 9bb77fe0c..d83ec3339 100644
--- a/services/sync.js
+++ b/services/sync.js
@@ -5,7 +5,7 @@ const rp = require('request-promise');
 const sql = require('./sql');
 const options = require('./options');
 const utils = require('./utils');
-const sourceId = require('./source_id');
+const source_id = require('./source_id');
 const notes = require('./notes');
 const syncUpdate = require('./sync_update');
 const content_hash = require('./content_hash');
@@ -80,7 +80,7 @@ async function login() {
         hash: hash
     });
 
-    if (sourceId.isLocalSourceId(resp.sourceId)) {
+    if (source_id.isLocalSourceId(resp.sourceId)) {
         throw new Error(`Sync server has source ID ${resp.sourceId} which is also local. Try restarting sync server.`);
     }
 
@@ -109,7 +109,7 @@ async function pullSync(syncContext) {
     log.info("Pulled " + syncRows.length + " changes from " + changesUri);
 
     for (const sync of syncRows) {
-        if (sourceId.isLocalSourceId(sync.sourceId)) {
+        if (source_id.isLocalSourceId(sync.sourceId)) {
             log.info(`Skipping pull #${sync.id} ${sync.entityName} ${sync.entityId} because ${sync.sourceId} is a local source id.`);
 
             await setLastSyncedPull(sync.id);
diff --git a/services/sync_table.js b/services/sync_table.js
index 63623b8b4..33c6bde47 100644
--- a/services/sync_table.js
+++ b/services/sync_table.js
@@ -1,5 +1,5 @@
 const sql = require('./sql');
-const sourceId = require('./source_id');
+const source_id = require('./source_id');
 const utils = require('./utils');
 const sync_setup = require('./sync_setup');
 const log = require('./log');
@@ -45,7 +45,7 @@ async function addEntitySync(entityName, entityId, sourceId) {
         entityName: entityName,
         entityId: entityId,
         syncDate: utils.nowDate(),
-        sourceId: sourceId || sourceId.getCurrentSourceId()
+        sourceId: sourceId || source_id.getCurrentSourceId()
     });
 
     if (!sync_setup.isSyncSetup) {