From 2908ed61a6412bb35568be42a7272ce38bd27442 Mon Sep 17 00:00:00 2001 From: Pablo Sanchez Date: Tue, 21 Feb 2017 10:49:00 +0000 Subject: [PATCH 1/2] [FIX] #18026 - PostgreSQL: improve table existence check (or assume default schema as "public") --- .idea/blade.xml | 4 + .idea/encodings.xml | 6 + .idea/fileColors.xml | 6 + .idea/framework.iml | 18 ++ .idea/misc.xml | 28 +++ .idea/modules.xml | 8 + .idea/php.xml | 4 + .idea/vcs.xml | 6 + .idea/workspace.xml | 217 ++++++++++++++++++ .../Database/Schema/PostgresBuilder.php | 2 + 10 files changed, 299 insertions(+) create mode 100644 .idea/blade.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/fileColors.xml create mode 100644 .idea/framework.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/blade.xml b/.idea/blade.xml new file mode 100644 index 000000000000..ddb9fb5402a7 --- /dev/null +++ b/.idea/blade.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000000..97626ba45445 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/fileColors.xml b/.idea/fileColors.xml new file mode 100644 index 000000000000..8c2c0b7fe9c7 --- /dev/null +++ b/.idea/fileColors.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/framework.iml b/.idea/framework.iml new file mode 100644 index 000000000000..b31359362cfa --- /dev/null +++ b/.idea/framework.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000000..6f4e80bcd97d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000000..fd63bed5ec68 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 000000000000..4f0611e785ea --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000000..94a25f7f4cb4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000000..8865214841f4 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1487674036399 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Illuminate/Database/Schema/PostgresBuilder.php b/src/Illuminate/Database/Schema/PostgresBuilder.php index 42198f89fcc1..029adc9ae48a 100755 --- a/src/Illuminate/Database/Schema/PostgresBuilder.php +++ b/src/Illuminate/Database/Schema/PostgresBuilder.php @@ -16,6 +16,8 @@ public function hasTable($table) $schema = head($schema); } + $schema ? $schema : 'public'; + $table = $this->connection->getTablePrefix().$table; return count($this->connection->select( From 2ae78589719cb5dcf957ad203636498d5506dadb Mon Sep 17 00:00:00 2001 From: Pablo Sanchez Date: Tue, 21 Feb 2017 10:49:30 +0000 Subject: [PATCH 2/2] [FIX] #18026 - PostgreSQL: improve table existence check (or assume default schema as "public") --- .idea/blade.xml | 4 - .idea/encodings.xml | 6 -- .idea/fileColors.xml | 6 -- .idea/framework.iml | 18 ---- .idea/misc.xml | 28 ------ .idea/modules.xml | 8 -- .idea/php.xml | 4 - .idea/vcs.xml | 6 -- .idea/workspace.xml | 217 ------------------------------------------- 9 files changed, 297 deletions(-) delete mode 100644 .idea/blade.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/fileColors.xml delete mode 100644 .idea/framework.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/blade.xml b/.idea/blade.xml deleted file mode 100644 index ddb9fb5402a7..000000000000 --- a/.idea/blade.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba45445..000000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/fileColors.xml b/.idea/fileColors.xml deleted file mode 100644 index 8c2c0b7fe9c7..000000000000 --- a/.idea/fileColors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/framework.iml b/.idea/framework.iml deleted file mode 100644 index b31359362cfa..000000000000 --- a/.idea/framework.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 6f4e80bcd97d..000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index fd63bed5ec68..000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 4f0611e785ea..000000000000 --- a/.idea/php.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb4..000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 8865214841f4..000000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1487674036399 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file