Remove null constraint names. Refs #3

nwronski · nwronski · commit 146bb636db8e · 2015-09-29T01:18:32.000-04:00
Still had some null values for column constraint names.
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -1634,14 +1634,16 @@ column_constraint_tail
 column_constraint "Column Constraint"
   = n:( column_constraint_name )? c:( column_constraint_types )
   {
-    return util.extend({
-      'name': n
-    }, c);
+    return util.extend(c, n);
   }
 
 column_constraint_name "Column Constraint Name"
   = CONSTRAINT e n:( name ) o
-  { return n; }
+  {
+    return {
+      'name': n
+    };
+  }
 
 column_constraint_types
   = column_constraint_primary
diff --git a/test/json/create-table/basic-create-table.json b/test/json/create-table/basic-create-table.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
diff --git a/test/json/create-table/create-check-1.json b/test/json/create-table/create-check-1.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -35,12 +34,10 @@
           "name": "name",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             },
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
@@ -64,7 +61,6 @@
           "name": "wings",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "check",
               "expression": {
@@ -98,7 +94,6 @@
           "name": "legs",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "check",
               "expression": {
diff --git a/test/json/create-table/create-check-2.json b/test/json/create-table/create-check-2.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -35,12 +34,10 @@
           "name": "name",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             },
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
diff --git a/test/json/create-table/create-foreign-key-1.json b/test/json/create-table/create-foreign-key-1.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -47,7 +46,6 @@
           "name": "hive_id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
diff --git a/test/json/create-table/create-foreign-key-2.json b/test/json/create-table/create-foreign-key-2.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -47,12 +46,10 @@
           "name": "hive_id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             },
             {
-              "name": null,
               "variant": "foreign key",
               "type": "constraint",
               "action": null,
diff --git a/test/json/create-table/create-primary-key-1.json b/test/json/create-table/create-primary-key-1.json
@@ -41,7 +41,6 @@
           "name": "hive_id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
diff --git a/test/json/create-virtual-table/create-virtual-table-alt-syntax.json b/test/json/create-virtual-table/create-virtual-table-alt-syntax.json
@@ -17,7 +17,6 @@
             "name": "id",
             "definition": [
               {
-                "name": null,
                 "type": "constraint",
                 "variant": "primary key"
               }
diff --git a/test/json/datatypes/basic-datatypes.json b/test/json/datatypes/basic-datatypes.json
@@ -507,7 +507,6 @@
           "name": "a",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             }
@@ -531,7 +530,6 @@
           "name": "b",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "null"
             }
@@ -549,7 +547,6 @@
           "name": "c",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             }
@@ -567,7 +564,6 @@
           "name": "d",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "null"
             }
@@ -585,7 +581,6 @@
           "name": "e",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "null"
             }
diff --git a/test/json/multiple-queries/multiple-queries-2.json b/test/json/multiple-queries/multiple-queries-2.json
@@ -17,7 +17,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -35,12 +34,10 @@
           "name": "name",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             },
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
@@ -130,7 +127,6 @@
           "name": "id",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "primary key"
             }
@@ -148,12 +144,10 @@
           "name": "title",
           "definition": [
             {
-              "name": null,
               "type": "constraint",
               "variant": "not null"
             },
             {
-              "name": null,
               "type": "constraint",
               "variant": "unique"
             }
@@ -265,7 +259,6 @@
           "name": "actor_id",
           "definition": [
             {
-              "name": null,
               "variant": "foreign key",
               "type": "constraint",
               "action": null,
@@ -290,7 +283,6 @@
           "name": "movie_id",
           "definition": [
             {
-              "name": null,
               "variant": "foreign key",
               "type": "constraint",
               "action": null,
diff --git a/test/json/transactions/basic-transaction.json b/test/json/transactions/basic-transaction.json
@@ -22,7 +22,6 @@
               "name": "id",
               "definition": [
                 {
-                  "name": null,
                   "type": "constraint",
                   "variant": "primary key"
                 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`"name": "id",`
`18`	`18`	`"definition": [`
`19`	`19`	`{`
`20`		`- "name": null,`
`21`	`20`	`"type": "constraint",`
`22`	`21`	`"variant": "primary key"`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`"name": "hive_id",`
`42`	`42`	`"definition": [`
`43`	`43`	`{`
`44`		`- "name": null,`
`45`	`44`	`"type": "constraint",`
`46`	`45`	`"variant": "unique"`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,6 @@`
`507`	`507`	`"name": "a",`
`508`	`508`	`"definition": [`
`509`	`509`	`{`
`510`		`- "name": null,`
`511`	`510`	`"type": "constraint",`
`512`	`511`	`"variant": "not null"`
`513`	`512`	`}`
`@@ -531,7 +530,6 @@`
`531`	`530`	`"name": "b",`
`532`	`531`	`"definition": [`
`533`	`532`	`{`
`534`		`- "name": null,`
`535`	`533`	`"type": "constraint",`
`536`	`534`	`"variant": "null"`
`537`	`535`	`}`
`@@ -549,7 +547,6 @@`
`549`	`547`	`"name": "c",`
`550`	`548`	`"definition": [`
`551`	`549`	`{`
`552`		`- "name": null,`
`553`	`550`	`"type": "constraint",`
`554`	`551`	`"variant": "not null"`
`555`	`552`	`}`
`@@ -567,7 +564,6 @@`
`567`	`564`	`"name": "d",`
`568`	`565`	`"definition": [`
`569`	`566`	`{`
`570`		`- "name": null,`
`571`	`567`	`"type": "constraint",`
`572`	`568`	`"variant": "null"`
`573`	`569`	`}`
`@@ -585,7 +581,6 @@`
`585`	`581`	`"name": "e",`
`586`	`582`	`"definition": [`
`587`	`583`	`{`
`588`		`- "name": null,`
`589`	`584`	`"type": "constraint",`
`590`	`585`	`"variant": "null"`
`591`	`586`	`}`