Merge pull request #61 from radify/develop

Next release
radify · Mar 27, 2017 · 831c9a3 · 831c9a3
2 parents 5d68669 + eea5ea7
commit 831c9a3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/integration-test/index.js b/integration-test/index.js
@@ -16,7 +16,7 @@ var expected = {
       type: 'object',
 
       properties: {
-        id: {type: 'integer', readOnly: true},
+        id: {type: 'number', readOnly: true},
         username: {type: 'string'},
         password: {type: 'string'},
         created_at: {
@@ -52,7 +52,7 @@ var expected = {
       type: 'object',
       properties: {
         id: {
-          type: 'integer',
+          type: 'number',
           readOnly: true
         },
         title: {
@@ -74,7 +74,7 @@ var expected = {
           format: 'date-time'
         },
         owner: {
-          type: 'integer'
+          type: 'number'
         }
       },
       required: ['title', 'owner']
@@ -100,10 +100,10 @@ var expected = {
       type: 'object',
       properties: {
         user_id: {
-          type: 'integer'
+          type: 'number'
         },
         task_id: {
-          type: 'integer'
+          type: 'number'
         }
       },
       required: ['user_id', 'task_id']
@@ -130,13 +130,13 @@ var expected = {
 
       properties: {
         id: {
-          type: 'integer'
+          type: 'number'
         },
         username: {
           type: 'string'
         },
         completed: {
-          type: 'integer'
+          type: 'number'
         }
       },
 

diff --git a/spec/inspectors/schema.ts b/spec/inspectors/schema.ts
@@ -127,13 +127,13 @@ describe('schema', () => {
           minProperties: 1,
           additionalProperties: false,
           properties: {
-            milliseconds: {type: 'integer'},
-            seconds: {type: 'integer'},
-            minutes: {type: 'integer'},
-            hours:   {type: 'integer'},
-            days:    {type: 'integer'},
-            months:  {type: 'ingeger'},
-            years:   {type: 'integer'}
+            milliseconds: {type: 'number'},
+            seconds: {type: 'number'},
+            minutes: {type: 'number'},
+            hours:   {type: 'number'},
+            days:    {type: 'number'},
+            months:  {type: 'number'},
+            years:   {type: 'number'}
           }
         }
       })
@@ -150,7 +150,7 @@ describe('schema', () => {
 
       expect(result).toEqual({
         id: {
-          type: 'integer',
+          type: 'number',
           readOnly: true
         }
       });

diff --git a/src/inspectors/schema.ts b/src/inspectors/schema.ts
@@ -96,18 +96,18 @@ export function properties(columns: Column[]): SchemaProperties {
  */
 export function property(column: Column): SchemaProperties {
   const TYPES:any = {
-    bigserial:   {type: 'integer'},
+    bigserial:   {type: 'number'},
     boolean:     {type: 'boolean'},
     character:   {type: 'string'},
-    bigint:      {type: 'integer'},
-    integer:     {type: 'integer'},
+    bigint:      {type: 'number'},
+    integer:     {type: 'number'},
     json:        {type: 'object'},
     jsonb:       {type: 'object'},
     numeric:     {type: 'number'},
     real:        {type: 'number'},
-    smallint:    {type: 'integer'},
-    smallserial: {type: 'integer'},
-    serial:      {type: 'integer'},
+    smallint:    {type: 'number'},
+    smallserial: {type: 'number'},
+    serial:      {type: 'number'},
     text:        {type: 'string'},
 
     interval: {
@@ -116,13 +116,13 @@ export function property(column: Column): SchemaProperties {
       minProperties: 1,
       additionalProperties: false,
       properties: {
-        milliseconds: {type: 'integer'},
-        seconds: {type: 'integer'},
-        minutes: {type: 'integer'},
-        hours:   {type: 'integer'},
-        days:    {type: 'integer'},
-        months:  {type: 'ingeger'},
-        years:   {type: 'integer'}
+        milliseconds: {type: 'number'},
+        seconds: {type: 'number'},
+        minutes: {type: 'number'},
+        hours:   {type: 'number'},
+        days:    {type: 'number'},
+        months:  {type: 'number'},
+        years:   {type: 'number'}
       }
     },