Bugfix: updated inner delimiter from "." to "---" for sqlite support

Author: sleeping-owl

CHANGELOG

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2014-11-13, v1.0.3
+------------------
+
+* Bugfix: updated inner delimiter from "." to "---" for sqlite support
+
 2014-11-13, v1.0.2
 ------------------
 

src/SleepingOwl/WithJoin/WithJoinEloquentBuilder.php

@@ -64,7 +64,7 @@ protected function addNestedRelations($name, Relation $relation)
 		foreach ($nestedRelations as $nestedName => $nestedConstraints)
 		{
 			$relation = $class->$nestedName();
-			$this->addJoinToQuery($nestedName, $name, $relation, $name . '.' . static::$prefix);
+			$this->addJoinToQuery($nestedName, $name, $relation, $name . '---' . static::$prefix);
 		}
 	}
 
@@ -94,7 +94,7 @@ protected function addJoinToQuery($joinTableAlias, $currentTableAlias, Relation
 		$this->query->leftJoin($joinTable, $joinLeftCondition, '=', $joinRightCondition);
 
 		$columns = $this->getColumns($joinTableName);
-		$prefix = static::$prefix . $columnsPrefix . $joinTableAlias . '.';
+		$prefix = static::$prefix . $columnsPrefix . $joinTableAlias . '---';
 		foreach ($columns as $column)
 		{
 			$this->selectFromQuery($joinTableAlias, $column, $prefix . $column);

src/SleepingOwl/WithJoin/WithJoinTrait.php

@@ -21,6 +21,7 @@ public function newFromBuilder($attributes = [])
 			{
 				unset($attributes[$key]);
 				$key = substr($key, strlen($prefix));
+				$key = str_replace('---', '.', $key);
 				Arr::set($foreignData, $key, $value);
 			}
 		}

tests/WithJoinEloquentBuilderTest.php

@@ -75,7 +75,7 @@ public function it_replaces_subqueries_with_left_join_using_references()
 		$this->assertEquals('First Foo First Baz Bar', $bar->title);
 		$this->assertEquals('First Foo', $bar->foo->title);
 
-		$this->assertQuery('select "foo"."id" as "__f__foo.id", "foo"."title" as "__f__foo.title", "foo"."created_at" as "__f__foo.created_at", "foo"."updated_at" as "__f__foo.updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "bars"."id" = ? limit 1');
+		$this->assertQuery('select "foo"."id" as "__f__foo---id", "foo"."title" as "__f__foo---title", "foo"."created_at" as "__f__foo---created_at", "foo"."updated_at" as "__f__foo---updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "bars"."id" = ? limit 1');
 
 		$this->assertQueryCount(1);
 	}
@@ -87,7 +87,7 @@ public function it_replaces_subqueries_with_left_join_using_includes()
 		$this->assertEquals('First Foo First Baz Bar', $bar->title);
 		$this->assertEquals('First Foo', $bar->foo->title);
 
-		$this->assertQuery('select "foo"."id" as "__f__foo.id", "foo"."title" as "__f__foo.title", "foo"."created_at" as "__f__foo.created_at", "foo"."updated_at" as "__f__foo.updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "bars"."id" = ? limit 1');
+		$this->assertQuery('select "foo"."id" as "__f__foo---id", "foo"."title" as "__f__foo---title", "foo"."created_at" as "__f__foo---created_at", "foo"."updated_at" as "__f__foo---updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "bars"."id" = ? limit 1');
 
 		$this->assertQueryCount(1);
 	}
@@ -99,7 +99,7 @@ public function it_joins_table_by_relation_name_as_alias()
 		$this->assertEquals('First Foo First Baz Bar', $bar->title);
 		$this->assertEquals('First Foo', $bar->foo->title);
 
-		$this->assertQuery('select "foo"."id" as "__f__foo.id", "foo"."title" as "__f__foo.title", "foo"."created_at" as "__f__foo.created_at", "foo"."updated_at" as "__f__foo.updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "foo"."id" = ? limit 1');
+		$this->assertQuery('select "foo"."id" as "__f__foo---id", "foo"."title" as "__f__foo---title", "foo"."created_at" as "__f__foo---created_at", "foo"."updated_at" as "__f__foo---updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" where "foo"."id" = ? limit 1');
 
 		$this->assertQueryCount(1);
 	}
@@ -112,7 +112,7 @@ public function it_support_multiple_flat_joins()
 		$this->assertEquals('First Foo', $bar->foo->title);
 		$this->assertEquals('Second Baz', $bar->baz->title);
 
-		$this->assertQuery('select "foo"."id" as "__f__foo.id", "foo"."title" as "__f__foo.title", "foo"."created_at" as "__f__foo.created_at", "foo"."updated_at" as "__f__foo.updated_at", "baz"."id" as "__f__baz.id", "baz"."title" as "__f__baz.title", "baz"."created_at" as "__f__baz.created_at", "baz"."updated_at" as "__f__baz.updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" left join "bazs" as "baz" on "baz"."id" = "bars"."baz_id" where "foo"."id" = ? and "baz"."id" = ? limit 1');
+		$this->assertQuery('select "foo"."id" as "__f__foo---id", "foo"."title" as "__f__foo---title", "foo"."created_at" as "__f__foo---created_at", "foo"."updated_at" as "__f__foo---updated_at", "baz"."id" as "__f__baz---id", "baz"."title" as "__f__baz---title", "baz"."created_at" as "__f__baz---created_at", "baz"."updated_at" as "__f__baz---updated_at", "bars".* from "bars" left join "foos" as "foo" on "foo"."id" = "bars"."foo_id" left join "bazs" as "baz" on "baz"."id" = "bars"."baz_id" where "foo"."id" = ? and "baz"."id" = ? limit 1');
 
 		$this->assertQueryCount(1);
 	}
@@ -125,7 +125,7 @@ public function it_can_combine_with_and_joins()
 		$this->assertEquals('First Foo', $bar->foo->title);
 		$this->assertEquals('Second Baz', $bar->baz->title);
 
-		$this->assertQuery('select "baz"."id" as "__f__baz.id", "baz"."title" as "__f__baz.title", "baz"."created_at" as "__f__baz.created_at", "baz"."updated_at" as "__f__baz.updated_at", "bars".* from "bars" left join "bazs" as "baz" on "baz"."id" = "bars"."baz_id" where "baz"."id" = ? limit 1');
+		$this->assertQuery('select "baz"."id" as "__f__baz---id", "baz"."title" as "__f__baz---title", "baz"."created_at" as "__f__baz---created_at", "baz"."updated_at" as "__f__baz---updated_at", "bars".* from "bars" left join "bazs" as "baz" on "baz"."id" = "bars"."baz_id" where "baz"."id" = ? limit 1');
 		$this->assertQuery('select * from "foos" where "foos"."id" in (?)');
 
 		$this->assertQueryCount(2);
@@ -139,7 +139,7 @@ public function it_supports_nested_relations()
 		$this->assertEquals('First Foo First Baz Bar', $bom->bar->title);
 		$this->assertEquals('First Foo', $bom->bar->foo->title);
 
-		$this->assertQuery('select "bar"."id" as "__f__bar.id", "bar"."title" as "__f__bar.title", "bar"."foo_id" as "__f__bar.foo_id", "bar"."created_at" as "__f__bar.created_at", "bar"."updated_at" as "__f__bar.updated_at", "bar"."baz_id" as "__f__bar.baz_id", "foo"."id" as "__f__bar.__f__foo.id", "foo"."title" as "__f__bar.__f__foo.title", "foo"."created_at" as "__f__bar.__f__foo.created_at", "foo"."updated_at" as "__f__bar.__f__foo.updated_at", "boms".* from "boms" left join "bars" as "bar" on "bar"."id" = "boms"."bar_id" left join "foos" as "foo" on "foo"."id" = "bar"."foo_id" where "foo"."id" = ? limit 1');
+		$this->assertQuery('select "bar"."id" as "__f__bar---id", "bar"."title" as "__f__bar---title", "bar"."foo_id" as "__f__bar---foo_id", "bar"."created_at" as "__f__bar---created_at", "bar"."updated_at" as "__f__bar---updated_at", "bar"."baz_id" as "__f__bar---baz_id", "foo"."id" as "__f__bar---__f__foo---id", "foo"."title" as "__f__bar---__f__foo---title", "foo"."created_at" as "__f__bar---__f__foo---created_at", "foo"."updated_at" as "__f__bar---__f__foo---updated_at", "boms".* from "boms" left join "bars" as "bar" on "bar"."id" = "boms"."bar_id" left join "foos" as "foo" on "foo"."id" = "bar"."foo_id" where "foo"."id" = ? limit 1');
 
 		$this->assertQueryCount(1);
 	}