From 4cc1d118556880b41ee1b8c1f5430d8fcbbb7a9b Mon Sep 17 00:00:00 2001
From: gsplash <gsplashed@gmail.com>
Date: Sat, 19 Apr 2014 15:18:43 +0300
Subject: [PATCH 1/3] Grammer is already in use
---
src/Ccovey/ODBCDriver/ODBCDriverConnection.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
index fa57115..110952c 100644
--- a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
+++ b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
@@ -2,7 +2,6 @@
use Illuminate\Database\Connection;
use Illuminate\Database\Query\Grammars\Grammar;
-use Illuminate\Database\Schema\Grammars\Grammar;
class ODBCDriverConnection extends Connection
{
From 0db2ee90e419e16c3ad3ca99ae0e2e017a798bd5 Mon Sep 17 00:00:00 2001
From: gsplash <gsplashed@gmail.com>
Date: Sun, 4 May 2014 23:18:00 +0300
Subject: [PATCH 2/3] The old code doesnt work for migration part
---
src/Ccovey/ODBCDriver/ODBCDriverConnection.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
index 110952c..8ecb5cb 100644
--- a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
+++ b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
@@ -1,7 +1,7 @@
<?php namespace Ccovey\ODBCDriver;
use Illuminate\Database\Connection;
-use Illuminate\Database\Query\Grammars\Grammar;
+use Illuminate\Database;
class ODBCDriverConnection extends Connection
{
@@ -13,18 +13,18 @@ protected function getDefaultQueryGrammar()
$grammarConfig = $this->getGrammarConfig();
if ($grammarConfig) {
- $packageGrammar = "Ccovey\\ODBCDriver\\Grammars\\" . $grammarConfig;
+ $packageGrammar = "Ccovey\\ODBCDriver\\Grammars\\" . $grammarConfig;
if (class_exists($packageGrammar)) {
return $this->withTablePrefix(new $packageGrammar);
}
-
+
$illuminateGrammar = "Illuminate\\Database\\Query\\Grammars\\" . $grammarConfig;
if (class_exists($illuminateGrammar)) {
return $this->withTablePrefix(new $illuminateGrammar);
}
}
- return $this->withTablePrefix(new Grammar);
+ return $this->withTablePrefix(new Query\Grammars\Grammar);
}
/**
From 36c927e448ced775091c54a9202781aa8c68d2f9 Mon Sep 17 00:00:00 2001
From: gsplash <gsplashed@gmail.com>
Date: Sun, 4 May 2014 23:50:39 +0300
Subject: [PATCH 3/3] Update ODBCDriverConnection.php
---
src/Ccovey/ODBCDriver/ODBCDriverConnection.php | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
index 8ecb5cb..2bff1a4 100644
--- a/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
+++ b/src/Ccovey/ODBCDriver/ODBCDriverConnection.php
@@ -13,7 +13,7 @@ protected function getDefaultQueryGrammar()
$grammarConfig = $this->getGrammarConfig();
if ($grammarConfig) {
- $packageGrammar = "Ccovey\\ODBCDriver\\Grammars\\" . $grammarConfig;
+ $packageGrammar = "Illuminate\\Database" . $grammarConfig;
if (class_exists($packageGrammar)) {
return $this->withTablePrefix(new $packageGrammar);
}
@@ -33,6 +33,18 @@ protected function getDefaultQueryGrammar()
*/
protected function getDefaultSchemaGrammar()
{
+ $grammarConfig = $this->getGrammarConfig();
+ if ($grammarConfig) {
+ $packageGrammar = "Illuminate\\Database" . $grammarConfig;
+ if (class_exists($packageGrammar)) {
+ return $this->withTablePrefix(new $packageGrammar);
+ }
+
+ $illuminateGrammar = "Illuminate\\Database\\Schema\\Grammars\\" . $grammarConfig;
+ if (class_exists($illuminateGrammar)) {
+ return $this->withTablePrefix(new $illuminateGrammar);
+ }
+ }
return $this->withTablePrefix(new Schema\Grammars\Grammar);
}