Added a field test for merging the mapping keyword with other keywords

clintongormley · Jun 24, 2012 · ea3274c · ea3274c
1 parent 906da37
commit ea3274c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/Elastic/Model/TypeMap/Base.pm b/lib/Elastic/Model/TypeMap/Base.pm
@@ -286,9 +286,9 @@ sub attribute_mapping {
     my $mapping = $attr->can('mapping') && $attr->mapping
         || { $map->find_mapper($attr) };
 
-    my $type = $mapping->{type};
+    my $type = $mapping->{type} || '';
     if ( $attr->can('type') ) {
-        my $new_type = $attr->type;
+        my $new_type = $attr->type ;
         if ( $new_type and $new_type ne $type ) {
             delete $mapping->{enabled}
                 if $type eq 'object';

diff --git a/t/10_typemaps/21_type_string.t b/t/10_typemaps/21_type_string.t
@@ -57,6 +57,7 @@ our @mapping = (
         },
     },
 
+    mapping => { type => 'integer', store => 1 },
     bad_opt   => qr/doesn't understand 'precision_step'/,
     bad_multi => qr/doesn't understand 'format'/
 

diff --git a/t/lib/FieldTest/String.pm b/t/lib/FieldTest/String.pm
@@ -68,6 +68,17 @@ has 'multi_attr' => (
     }
 );
 
+#===================================
+has 'mapping_attr' => (
+#===================================
+    is => 'ro',
+    isa => 'Str',
+    type =>'integer',
+    mapping => {
+        store =>1
+    }
+);
+
 #===================================
 has 'bad_opt_attr' => (
 #===================================