Index: src/main/groovy/sql/Sql.java
===================================================================
RCS file: /home/projects/groovy/scm/groovy/groovy-core/src/main/groovy/sql/Sql.java,v
retrieving revision 1.18
diff -u -r1.18 Sql.java
--- src/main/groovy/sql/Sql.java	13 Jan 2005 12:51:01 -0000	1.18
+++ src/main/groovy/sql/Sql.java	13 Feb 2005 19:45:08 -0000
@@ -44,12 +44,14 @@
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -367,6 +369,69 @@
     public void queryEach(GString gstring, Closure closure) throws SQLException {
         warnDeprecated();
         eachRow(gstring, closure);
+    }
+    
+    /**
+     * Performs the given SQL query with the list of params and return 
+     * the first row of the result set
+     */
+    public Object oneRow(String sql, List params) throws SQLException {
+        GroovyOneRowResult result = null;
+        LinkedHashMap lhm = new LinkedHashMap();
+        Connection connection = createConnection();
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        try {
+            log.fine(sql);
+            statement = connection.prepareStatement(sql);
+            setParameters(params, statement);
+            configure(statement);
+            rs = statement.executeQuery(sql);
+            rs.next();
+            ResultSetMetaData metadata = rs.getMetaData();
+            for(int i=1 ; i<=metadata.getColumnCount() ; i++) {
+        	      lhm.put(metadata.getColumnName(i),rs.getObject(i));
+            }
+            result = new GroovyOneRowResult(lhm);
+            return(result);
+        }
+        catch (SQLException e) {
+            log.log(Level.FINE, "Failed to execute: " + sql, e);
+            throw e;
+        }
+        finally {
+            closeResources(connection, statement, rs);
+        }
+    }
+    
+    /**
+     * Performs the given SQL query and return the first row of the result set
+     */
+    public Object oneRow(String sql) throws SQLException {
+        GroovyOneRowResult result = null;
+        LinkedHashMap lhm = new LinkedHashMap();
+        Connection connection = createConnection();
+        Statement statement = connection.createStatement();
+        configure(statement);
+        ResultSet rs = null;
+        try {
+            log.fine(sql);
+            rs = statement.executeQuery(sql);
+            rs.next();
+            ResultSetMetaData metadata = rs.getMetaData();
+            for(int i=1 ; i<=metadata.getColumnCount() ; i++) {
+        	      lhm.put(metadata.getColumnName(i),rs.getObject(i));
+            }
+            result = new GroovyOneRowResult(lhm);
+            return(result);
+        }
+        catch (SQLException e) {
+            log.log(Level.FINE, "Failed to execute: " + sql, e);
+            throw e;
+        }
+        finally {
+            closeResources(connection, statement, rs);
+        }
     }
 
     /**
Index: src/main/groovy/sql/GroovyOneRowResult.java
===================================================================
RCS file: src/main/groovy/sql/GroovyOneRowResult.java
diff -N src/main/groovy/sql/GroovyOneRowResult.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/main/groovy/sql/GroovyOneRowResult.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,112 @@
+/*
+$Id$
+
+Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+   statements and notices.  Redistributions must also contain a
+   copy of this document.
+
+2. Redistributions in binary form must reproduce the
+   above copyright notice, this list of conditions and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+
+3. The name "groovy" must not be used to endorse or promote
+   products derived from this Software without prior written
+   permission of The Codehaus.  For written permission,
+   please contact info@codehaus.org.
+
+4. Products derived from this Software may not be called "groovy"
+   nor may "groovy" appear in their names without prior written
+   permission of The Codehaus. "groovy" is a registered
+   trademark of The Codehaus.
+
+5. Due credit should be given to The Codehaus -
+   http://groovy.codehaus.org/
+
+THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+package groovy.sql;
+
+import groovy.lang.GroovyObjectSupport;
+import groovy.lang.MissingPropertyException;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+/**
+* Represents an extent of objects.
+* It's used in the oneRow method to be able to access the result
+* of a SQL query by the name of the column, or by the column number.
+* 
+* @Author Jean-Louis Berliet
+* @version $Revision$
+*/
+public class GroovyOneRowResult extends GroovyObjectSupport {
+
+   private LinkedHashMap result;
+
+   public GroovyOneRowResult(LinkedHashMap result) {
+       this.result = result;
+   }
+
+   /**
+    * Retrieve the value of the property by its name    * 
+    * @param property is the name of the property to look at
+    * @return the value of the property
+    */
+   public Object getProperty(String property) {
+       try {
+           Object value = result.get(property);
+           if (value==null)
+               throw new MissingPropertyException(property, GroovyOneRowResult.class);
+           else
+               return(value); 
+       }
+       catch (Exception e) {
+           throw new MissingPropertyException(property, GroovyOneRowResult.class, e);
+       }
+   }
+
+   /**
+    * Retrieve the value of the property by its index.
+    * A negative index will count backwards from the last column.
+    * @param index is the number of the column to look at
+    * @return the value of the property
+    */
+  public Object getAt(int index) {
+       try {
+           // a negative index will count backwards from the last column.
+           if (index<0) 
+               index += result.size();
+           Iterator it = result.values().iterator();
+           int i = 0;
+           Object obj = null;
+           while (it.hasNext() && index>=0 && index<result.size()) {
+               if (index==i)
+                   obj = it.next();
+           }
+           return(obj);
+       }
+       catch (Exception e) {
+           throw new MissingPropertyException("", GroovyOneRowResult.class, e);
+       }
+   }
+}
Index: src/test/groovy/sql/OneRowTest.groovy
===================================================================
RCS file: src/test/groovy/sql/OneRowTest.groovy
diff -N src/test/groovy/sql/OneRowTest.groovy
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/test/groovy/sql/OneRowTest.groovy	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,77 @@
+package groovy.sql
+
+class OneRowTest extends TestHelper {
+
+    void testSqlOneRowWithPropertyName() {
+        sql = createSql()
+
+        results = sql.oneRow("select * from PERSON where firstName=James and lastName=Strachan").firstName
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=James and lastName=Strachan")["fistName"]
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=James and lastName=Strachan").lastName
+        expected = "Strachan"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=James and lastName=Strachan")["lastName"]
+        expected = "Strachan"
+        assert results == expected
+    }
+
+    void testSqlOneRowWithPropertyNameAndParams() {
+        sql = createSql()
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"]).fistName
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"])["fistName"]
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"]).lastName
+        expected = "Strachan"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"])["lastName"]
+        expected = "Strachan"
+        assert results == expected
+    }
+
+    void testSqlOneRowWithPropertyNumber() {
+        sql = createSql()
+
+        results = sql.oneRow("select firstName, lastName from PERSON where firstName=James and lastName=Strachan")[0]
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select firstName, lastName from PERSON where firstName=James and lastName=Strachan")[1]
+        expected = "Strachan"
+        assert results == expected
+
+        results = sql.oneRow("select firstName, lastName from PERSON where firstName=James and lastName=Strachan")[-1]
+        expected = "Strachan"
+        assert results == expected
+    }
+
+    void testSqlOneRowWithPropertyNumberAndParams() {
+        sql = createSql()
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"])[0]
+        expected = "James"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"])[1]
+        expected = "Strachan"
+        assert results == expected
+
+        results = sql.oneRow("select * from PERSON where firstName=? and lastName=?", ["James","Strachan"])[-1]
+        expected = "Strachan"
+        assert results == expected
+    }
+
+}