Merge pull request #13 from spider-gazelle/feat/optional_array

feat: Added support for nillable Array/Set/Enum

spec/persistence_spec.cr

@@ -316,6 +316,21 @@ describe "callbacks" do
     model.name.should eq "bob"
   end
 
+  it "test nillable array columns" do
+    model = Arrtest.where("arr2 @> ARRAY['three']").first?
+    model.should_not be_nil
+    model = model.not_nil!
+    model.arr1.should be_nil
+
+    model.try &.reload!
+    model.arr1.should be_nil
+
+    model = Arrtest.create!(arr1: ["one"])
+    model.id.should_not be_nil
+    model.arr1.should eq(["one"])
+    model.arr2.should eq([] of String)
+  end
+
   it "test update fields on array columns" do
     model = Tree.create
     model.update_fields(roots: ["Node1", "Node2"])

spec/spec_helper.cr

@@ -156,6 +156,18 @@ Spec.before_suite do
       starting_time TIME GENERATED ALWAYS AS ((TO_TIMESTAMP(ts::BIGINT) AT TIME ZONE 'UTC')::TIME) STORED
     );
     SQL
+
+    db.exec <<-SQL
+    CREATE TABLE IF NOT EXISTS arrtest (
+      id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+      arr1 TEXT [],
+      arr2 TEXT[] NOT NULL DEFAULT '{}'
+    );
+    SQL
+
+    db.exec <<-SQL
+      INSERT INTO arrtest(arr2) values('{"three","four"}');
+    SQL
   end
 
   1.upto(2) do |_|
@@ -183,5 +195,6 @@ Spec.after_suite do
     db.exec "DROP TABLE IF EXISTS root"
     db.exec "DROP TABLE IF EXISTS enums"
     db.exec "DROP TABLE IF EXISTS compute"
+    db.exec "DROP TABLE IF EXISTS arrtest"
   end
 end

spec/spec_models.cr

@@ -296,3 +296,8 @@ class ModelWithComputedFields < PgORM::Base
   attribute ts : Int64
   attribute description : String, read_only: true
 end
+
+class Arrtest < PgORM::Base
+  attribute arr1 : Array(String)? = nil
+  attribute arr2 : Array(String) = [] of String
+end

src/pg-orm/base.cr

@@ -179,7 +179,7 @@ module PgORM
               var_{{key}} =
                 {% if opts[:converter] %}
                   {{opts[:converter]}}.from_rs(rs)
-                {% elsif opts[:klass] < Array %}
+                {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Array %}
                   rs.read({{opts[:klass]}})
                 {% elsif opts[:klass] < Set %}
                   rs.read(Array({{opts[:klass].type_vars.join(' ').id}})).to_set
@@ -252,9 +252,9 @@ module PgORM
                 @{{key}} =
                   {% if opts[:converter] %}
                     {{opts[:converter]}}.from_rs(rs)
-                  {% elsif opts[:klass] < Array %}
+                  {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Array %}
                     rs.read({{opts[:klass]}})
-                  {% elsif opts[:klass] < Set %}
+                  {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Set %}
                   rs.read(Array({{opts[:klass].type_vars.join(' ').id}})).to_set
                   {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Enum %}
                     {% if opts[:klass].nilable? %}
@@ -310,9 +310,9 @@ module PgORM
         {
           {% for name, opts in PERSIST %}
             {% if !opts[:tags] || (tags = opts[:tags]) && (!tags[:read_only]) %}
-              {% if opts[:klass] < Array && !opts[:converter] %}
+              {% if opts[:klass].union_types.reject(&.==(Nil)).first < Array && !opts[:converter] %}
               :{{name}} => PQ::Param.encode_array(@{{name}} || ([] of {{opts[:klass]}})),
-              {% elsif opts[:klass] < Set %}
+              {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Set %}
               :{{name}} => PQ::Param.encode_array((@{{name}} || (Set({{opts[:klass]}}).new)).to_a),
               {% elsif opts[:klass].union_types.reject(&.==(Nil)).first < Enum && !opts[:converter] %}
               :{{name}} => @{{name}}.try &.value,

test

@@ -5,22 +5,22 @@ set -eu
 # this function is called when Ctrl-C is sent
 function trap_ctrlc ()
 {
-    docker-compose down &> /dev/null
+    docker compose down &> /dev/null
     exit 2
 }
 
 # initialise trap to call trap_ctrlc function
 # when signal 2 (SIGINT) is received
 trap "trap_ctrlc" 2
 
-docker-compose pull -q
+docker compose pull -q
 
-docker-compose build -q
+docker compose build -q
 
 exit_code="0"
 
-docker-compose run --rm pgorm "$@" || exit_code="$?"
+docker compose run --rm pgorm "$@" || exit_code="$?"
 
-docker-compose down &> /dev/null
+docker compose down &> /dev/null
 
 exit ${exit_code}