Update unit tests for and fix bug with entity_type type being overriden

src/metabase/models/table.clj

@@ -26,8 +26,7 @@
 (defentity Table
   [(table :metabase_table)
    (hydration-keys table)
-   (types :entity_type :keyword)
-   (types :visibility_type :keyword)
+   (types :entity_type :keyword, :visibility_type :keyword)
    timestamped]
 
   (post-select [_ {:keys [id db db_id description] :as table}]

test/metabase/api/meta/db_test.clj

@@ -160,11 +160,11 @@
 (expect
     (let [db-id (db-id)]
       [(match-$ (Table (id :categories))
-         {:description nil, :entity_type nil, :name "CATEGORIES", :rows 75, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Categories"})
+         {:description nil, :entity_type nil, :visibility_type nil, :name "CATEGORIES", :rows 75, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Categories"})
        (match-$ (Table (id :checkins))
-         {:description nil, :entity_type nil, :name "CHECKINS", :rows 1000, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Checkins"})
+         {:description nil, :entity_type nil, :visibility_type nil, :name "CHECKINS", :rows 1000, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Checkins"})
        (match-$ (Table (id :users))
-         {:description nil, :entity_type nil, :name "USERS", :rows 15, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Users"})
+         {:description nil, :entity_type nil, :visibility_type nil, :name "USERS", :rows 15, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Users"})
        (match-$ (Table (id :venues))
-         {:description nil, :entity_type nil, :name "VENUES", :rows 100, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Venues"})])
+         {:description nil, :entity_type nil, :visibility_type nil, :name "VENUES", :rows 100, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Venues"})])
   ((user->client :rasta) :get 200 (format "meta/db/%d/tables" (db-id))))

test/metabase/api/meta/field_test.clj

@@ -18,6 +18,7 @@
        :table (match-$ (Table (id :users))
                 {:description nil
                  :entity_type nil
+                 :visibility_type nil
                  :db (match-$ (db)
                        {:created_at $
                         :engine "h2"

test/metabase/api/meta/table_test.clj

@@ -52,7 +52,7 @@
                                   :rows                100
                                   :id                  (id :venues)}]))))
   (->> ((user->client :rasta) :get 200 "meta/table")
-       (map #(dissoc % :db :created_at :updated_at :entity_name :description :entity_type))
+       (map #(dissoc % :db :created_at :updated_at :entity_name :description :entity_type :visibility_type))
        set))
 
 ;; ## GET /api/meta/table/:id
@@ -60,6 +60,7 @@
     (match-$ (Table (id :venues))
       {:description nil
        :entity_type nil
+       :visibility_type nil
        :db          (match-$ (db)
                       {:created_at $
                        :engine "h2"
@@ -120,6 +121,7 @@
     (match-$ (Table (id :categories))
       {:description  nil
        :entity_type  nil
+       :visibility_type nil
        :db           (match-$ (db)
                        {:created_at      $
                         :engine          "h2"
@@ -199,6 +201,7 @@
     (match-$ (sel :one Table :id (id :users))
       {:description  nil
        :entity_type  nil
+       :visibility_type nil
        :db           (match-$ (db)
                        {:created_at      $
                         :engine          "h2"
@@ -311,6 +314,7 @@
     (match-$ (Table (id :users))
       {:description  nil
        :entity_type  nil
+       :visibility_type nil
        :db           (match-$ (db)
                        {:created_at      $
                         :engine          "h2"
@@ -405,10 +409,11 @@
 (expect-eval-actual-first
     (match-$ (let [table (Table (id :users))]
                ;; reset Table back to its original state
-               (upd Table (id :users) :display_name "Users" :entity_type nil :description nil)
+               (upd Table (id :users) :display_name "Users" :entity_type nil :visibility_type nil :description nil)
                table)
       {:description "What a nice table!"
        :entity_type "person"
+       :visibility_type "hidden"
        :db          (match-$ (db)
                       {:description     nil
                        :organization_id $
@@ -430,6 +435,7 @@
        :created_at  $})
   (do ((user->client :crowberto) :put 200 (format "meta/table/%d" (id :users)) {:display_name "Userz"
                                                                                 :entity_type "person"
+                                                                                :visibility_type "hidden"
                                                                                 :description "What a nice table!"})
       ((user->client :crowberto) :get 200 (format "meta/table/%d" (id :users)))))
 
@@ -464,6 +470,7 @@
                          :table           (match-$ (Table (id :checkins))
                                             {:description nil
                                              :entity_type nil
+                                             :visibility_type nil
                                              :name        "CHECKINS"
                                              :display_name "Checkins"
                                              :rows        1000
@@ -500,6 +507,7 @@
                          :table           (match-$ (Table (id :users))
                                             {:description nil
                                              :entity_type nil
+                                             :visibility_type nil
                                              :name        "USERS"
                                              :display_name "Users"
                                              :rows        15