From 963fb4331e7414ca4fa9c004baf6ae66b2061aef Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 5 Feb 2014 15:44:25 +0100
Subject: [PATCH] Fixed some regressions introduced with recent refactorings

---
 jOOQ-test/src/org/jooq/test/SQLServerTest.java             | 2 --
 jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Power.java                | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Sqrt.java                 | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
index 3f8c4e85e1..21eb79bf19 100644
--- a/jOOQ-test/src/org/jooq/test/SQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
@@ -825,8 +825,6 @@ xxxxxx xxxxx xxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
                 xxxxxxxxxxxxxxxx
                 xxxxxxxxxxxxxxxx
                 xxxxxxxxxxxxxxx
-
-        xxxxx xxx xxxxxxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxx xxxxxxxxx
     x
 
     xxxxx
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
index e770619bfc..e0b2c4a03b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -920,7 +920,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                     .mul(tanh(1.0))
                     .mul(power(coth(1.0), 2).add(0.1));
 
-                record = create().select(t1, t2, t3, t4, t6, t7, t8, t9, tb).fetchOne();
+                record = create().select(t1, t2, t3, t4, t6, t7, t8, t9, ta, tb).fetchOne();
 
                 // Rounding issues are circumvented by using substring()
                 assertNotNull(record);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index 24a79d12b0..b4a85be33a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -80,7 +80,7 @@ class Power extends AbstractFunction<BigDecimal> {
                 return DSL.exp(DSL.ln(arg1).mul(arg2));
 
             default:
-                return field("{power}({0})", SQLDataType.NUMERIC, getArguments());
+                return field("{power}({0}, {1})", SQLDataType.NUMERIC, getArguments());
         }
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index 97e4f42ef2..92b1b139f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -77,7 +77,7 @@ class Sqrt extends AbstractFunction<BigDecimal> {
                 return DSL.power(argument, 0.5);
 
             default:
-                return field("sqrt", SQLDataType.NUMERIC, argument);
+                return field("{sqrt}({0})", SQLDataType.NUMERIC, argument);
         }
     }
 }