Code

Query merging at top level#277

Code

Merged

helfer merged 25 commits intomasterapollographql/apollo-client:masterfrom query_mergingapollographql/apollo-client:query_mergingCopy head branch name to clipboardJun 17, 2016

+1,309-49

Commits

Commits on Jun 15, 2016

• added some of the basic stuff needed to do query merging

  Poincare

  committed
  b91376a

• added all the stuff needed for named fragments, queries, inline fragments to work within query merging

  Poincare

  committed
  a91d3b7

• query merging working, including variable renaming and fragment spread renaming

  Poincare

  committed
  5e4c886

• came to the point where a merge queries method actually works

  Poincare

  committed
  9b954fd

• added more tests and fixed an issue with inline fragments

  Poincare

  committed
  d2da2db

• WIP commit for addQueryComposition

  Poincare

  committed
  c5ea44e

• moved the Request object to use a Document structure rather than the serialized string structure

  Poincare

  committed
  01e91f2

• added request and variable merging

  Poincare

  committed
  bc60893

• changed the way fields inside inline fragments are numbered to prevent collisions

  Poincare

  committed
  7d99c72

• added tests for merged result unpacking and fixed issue with fragment spreads within result unpacking

  Poincare

  committed
  65be5fe

• tests passing on addQueryComposition and fetchManyQueries

  Poincare

  committed
  7df3ab2

• removed npm debug log

  Poincare

  committed
  fc1406b

• fixed filesize issue thanks to @jbaxleyiii

  Poincare

  committed
  20b0652

• got rid of swap file

  Poincare

  committed
  a91324c

• fixing the issues caused by rebasing onto master

  Poincare

  committed
  7c9f945

• fixing another rebase issue

  Poincare

  committed
  5181339

• renamed from composition to merging

  Poincare

  committed
  cc4fc6d

• updated test spec to get rid of the batching tests from the other branch

  Poincare

  committed
  a42d9af

• removed the stray directives file

  Poincare

  committed
  b6c6f38

• fixed indentation

  Poincare

  committed
  1c10589

• fixed stylistic issues and renamed a bunch of things

  Poincare

  committed
  846bd2e

• fixed stylistic stuff in the tests

  Poincare

  committed
  cbd9981

• Moved the marker to ___ and now throw errors on invalid variable + field names, etc

  Poincare

  committed
  6e9c8ab

• small change in comment

  Poincare

  committed
  0e06692

Commits on Jun 16, 2016

• added tests for several functions within query merging

  Poincare

  committed
  6a5c275