Shard updates, mysql uuid type, and api route bug fix (#1319)

* update database versions * update micrate shard * add mysql uuid field type * fixed printing api routes
amberframework · May 7, 2023 · 8f60747 · 8f60747
1 parent d7333fc
commit 8f60747
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/shard.yml b/shard.yml
@@ -40,19 +40,19 @@ dependencies:
 
   micrate:
     github: amberframework/micrate
-    version: ~> 0.12.0
+    version: ~> 0.15.0
 
   pg:
     github: will/crystal-pg
-    version: ~> 0.23.0
+    version: ~> 0.26.0
 
   mysql:
     github: crystal-lang/crystal-mysql
-    version: ~> 0.13.0
+    version: ~> 0.14.0
 
   sqlite3:
     github: crystal-lang/crystal-sqlite3
-    version: ~> 0.18.0
+    version: ~> 0.19.0
 
   redis:
     github: stefanwille/crystal-redis

diff --git a/src/amber/cli/commands/routes.cr b/src/amber/cli/commands/routes.cr
@@ -75,20 +75,21 @@ module Amber::CLI
         if route_match = resource_string.to_s.match(RESOURCE_ROUTE_REGEX)
           filter = route_match[4]?
           filter_actions = route_match[5]?.to_s.gsub(/\:|\s/, "").split(",")
+
           ACTION_MAPPING.each do |verb, v|
             v.each do |action|
               case filter
               when "only"
                 next unless filter_actions.includes?(action)
               when "except"
                 next if filter_actions.includes?(action)
-              else
-                build_route(
-                  verb: verb, controller: route_match[3]?, action: action,
-                  pipeline: current_pipe, scope: current_scope,
-                  uri_pattern: build_uri_pattern(route_match[2]?, action, current_scope)
-                )
               end
+
+              build_route(
+                verb: verb, controller: route_match[3]?, action: action,
+                pipeline: current_pipe, scope: current_scope,
+                uri_pattern: build_uri_pattern(route_match[2]?, action, current_scope)
+              )
             end
           end
         end

diff --git a/src/amber/cli/generators/field.cr b/src/amber/cli/generators/field.cr
@@ -29,6 +29,7 @@ module Amber::CLI
         password:  ["password", "String", "VARCHAR(255)"],
         time:      ["time", "Time", "TIMESTAMP NULL"],
         timestamp: ["time", "Time", "TIMESTAMP NULL"],
+        uuid:      ["uuid", "UUID", "binary(16)"],
       },
       sqlite: {
         int:       ["bigint", "Int64", "INT"],